mse/cmd/mse/main.go   | 4 ++--
 test/issue377_test.go | 6 +++---
 tracker/udp_test.go   | 1 +

diff --git a/mse/cmd/mse/main.go b/mse/cmd/mse/main.go
index 2d90398a085bc7b72ac8b4f0331e49b1feeae1e6..9485fc2a52683e3abf27990f09af933172e5fc0f 100644
--- a/mse/cmd/mse/main.go
+++ b/mse/cmd/mse/main.go
@@ -28,12 +28,12 @@ 			Network        string `arg:"positional"`
 			Address        string `arg:"positional"`
 			SecretKey      string `arg:"positional"`
 			InitialPayload []byte
-		} `arg:"subcommand""`
+		} `arg:"subcommand"`
 		Listen *struct {
 			Network    string   `arg:"positional"`
 			Address    string   `arg:"positional"`
 			SecretKeys []string `arg:"positional"`
-		} `arg:"subcommand""`
+		} `arg:"subcommand"`
 	}{
 		CryptoMethod: mse.AllSupportedCrypto,
 	}
diff --git a/test/issue377_test.go b/test/issue377_test.go
index 9e3febe6fe8aaf95a7a183df2f4728611fcb0e79..4ede3576293f3d878b303e22180f1cac2dd906cb 100644
--- a/test/issue377_test.go
+++ b/test/issue377_test.go
@@ -119,12 +119,12 @@ 		diskFullStorage: me,
 	}
 }
 
-func (me diskFullStorage) Close() error {
+func (me *diskFullStorage) Close() error {
 	return nil
 }
 
-func (d diskFullStorage) OpenTorrent(info *metainfo.Info, infoHash metainfo.Hash) (storage.TorrentImpl, error) {
-	return &d, nil
+func (d *diskFullStorage) OpenTorrent(info *metainfo.Info, infoHash metainfo.Hash) (storage.TorrentImpl, error) {
+	return d, nil
 }
 
 type pieceImpl struct {
diff --git a/tracker/udp_test.go b/tracker/udp_test.go
index 7a047b1ac62a80939346ee76dd0108acdd519331..d33550f14e80506f439ccf1345818815d7f90084 100644
--- a/tracker/udp_test.go
+++ b/tracker/udp_test.go
@@ -186,6 +186,7 @@ 			cancel()
 		}(url)
 	}
 	wg.Wait()
+	cancel()
 }
 
 // Check that URLPath option is done correctly.