diff --git a/cmd/dep_fixer/main.go b/cmd/dep_fixer/main.go
index bac3772..0647fb2 100644
--- a/cmd/dep_fixer/main.go
+++ b/cmd/dep_fixer/main.go
@@ -29,7 +29,7 @@
 
 func main() {
 	flag.Usage = func() {
-		fmt.Fprintf(os.Stderr, "Usage: %s <depfile.d>")
+		fmt.Fprintf(os.Stderr, "Usage: %s <depfile.d>", os.Args[0])
 		flag.PrintDefaults()
 	}
 	output := flag.String("o", "", "Optional output file (defaults to rewriting source if necessary)")
diff --git a/cmd/path_interposer/main_test.go b/cmd/path_interposer/main_test.go
index 4b25c44..c89d623 100644
--- a/cmd/path_interposer/main_test.go
+++ b/cmd/path_interposer/main_test.go
@@ -183,7 +183,7 @@
 	interposer := setup(t)
 	err := os.Remove(interposer + "_origpath")
 	if err != nil {
-		t.Fatalf("Failed to remove:", err)
+		t.Fatal("Failed to remove:", err)
 	}
 
 	exitCode, err := Main(ioutil.Discard, ioutil.Discard, interposer, []string{"true"}, mainOpts{})
diff --git a/cmd/pom2bp/pom2bp.go b/cmd/pom2bp/pom2bp.go
index 9aa25f0..9ce6b50 100644
--- a/cmd/pom2bp/pom2bp.go
+++ b/cmd/pom2bp/pom2bp.go
@@ -524,7 +524,7 @@
 		if pom.IsAar() {
 			err := pom.ExtractMinSdkVersion()
 			if err != nil {
-				fmt.Fprintln(os.Stderr, "Error reading manifest for %s: %s", pom.ArtifactFile, err)
+				fmt.Fprintf(os.Stderr, "Error reading manifest for %s: %s", pom.ArtifactFile, err)
 				os.Exit(1)
 			}
 		}
diff --git a/java/java.go b/java/java.go
index 89aa0e1..cf0aafd 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1034,7 +1034,7 @@
 			// TODO(pszczepaniak): Support kotlin-reflect
 			stripFiles = append(stripFiles,
 				"**/*.kotlin_module",
-				"**/*.kotlin_builtin")
+				"**/*.kotlin_builtins")
 		} else {
 			// Only add kotlin-stdlib if not using (on-device) renamed stdlib
 			// (it's expected to be on device bootclasspath)