diff --git a/archivefs/archivefs.go b/archivefs/archivefs.go
index cf824eb3..c902e938 100644
--- a/archivefs/archivefs.go
+++ b/archivefs/archivefs.go
@@ -12,6 +12,7 @@
//
// You should have received a copy of the GNU General Public License
// along with Gopher2600. If not, see .
+
package archivefs
import "io"
diff --git a/archivefs/archivefs_test.go b/archivefs/archivefs_test.go
index fed5fb44..41e0490a 100644
--- a/archivefs/archivefs_test.go
+++ b/archivefs/archivefs_test.go
@@ -12,6 +12,7 @@
//
// You should have received a copy of the GNU General Public License
// along with Gopher2600. If not, see .
+
package archivefs_test
import (
diff --git a/archivefs/extensions.go b/archivefs/extensions.go
index 42d83087..08111206 100644
--- a/archivefs/extensions.go
+++ b/archivefs/extensions.go
@@ -12,6 +12,7 @@
//
// You should have received a copy of the GNU General Public License
// along with Gopher2600. If not, see .
+
package archivefs
import (
diff --git a/archivefs/path.go b/archivefs/path.go
index d9920020..adb7411e 100644
--- a/archivefs/path.go
+++ b/archivefs/path.go
@@ -12,6 +12,7 @@
//
// You should have received a copy of the GNU General Public License
// along with Gopher2600. If not, see .
+
package archivefs
import (
diff --git a/cartridgeloader/doc.go b/cartridgeloader/doc.go
index 3811ea8f..e168d740 100644
--- a/cartridgeloader/doc.go
+++ b/cartridgeloader/doc.go
@@ -24,29 +24,29 @@
// The following file extensions are recognised and force the use of the
// specified mapper:
//
-// Atari 2k "2k"
-// Atari 4k "4k"
-// Atari 8k "F8"
-// Atari 16k "F6"
-// Atari 32k "F4"
-// Atari 2k (RAM) "2k+"
-// Atari 4k (RAM) "4k+"
-// Atari 8k (RAM) "F8+"
-// Atari 16k (RAM) "F6+"
-// Atari 32k (RAM) "F4+"
-// CBS "FA"
-// Parker Bros "E0"
-// M-Network "E7"
-// Tigervision "3F"
-// Supercharger "AR", "MP3, "WAV"
-// DF "DF"
-// 3E "3E"
-// 3E+ "3E+"
-// Superbank "SB"
+// Atari 2k "2k"
+// Atari 4k "4k"
+// Atari 8k "F8"
+// Atari 16k "F6"
+// Atari 32k "F4"
+// Atari 2k (RAM) "2k+"
+// Atari 4k (RAM) "4k+"
+// Atari 8k (RAM) "F8+"
+// Atari 16k (RAM) "F6+"
+// Atari 32k (RAM) "F4+"
+// CBS "FA"
+// Parker Bros "E0"
+// M-Network "E7"
+// Tigervision "3F"
+// Supercharger "AR", "MP3, "WAV"
+// DF "DF"
+// 3E "3E"
+// 3E+ "3E+"
+// Superbank "SB"
// DPC (Pitfall2) "DPC"
-// DPC+ "DP+"
-// CDF "CDF" (including CDFJ)
-// MovieCart "MVC"
+// DPC+ "DP+"
+// CDF "CDF" (including CDFJ)
+// MovieCart "MVC"
//
// File extensions are case insensitive.
//