diff --git a/main.go b/main.go
index 7d2d08b..17d4b60 100644
--- a/main.go
+++ b/main.go
@@ -182,7 +182,7 @@ func transformCompile(args []string) ([]string, error) {
 		Defs: make(map[*ast.Ident]types.Object),
 		Uses: make(map[*ast.Ident]types.Object),
 	}
-	if _, err := typesConfig.Check("current", fset, files, info); err != nil {
+	if _, err := typesConfig.Check("current.pkg/path", fset, files, info); err != nil {
 		return nil, fmt.Errorf("typecheck error: %v", err)
 	}
 
@@ -294,6 +294,7 @@ func transformGoFile(file *ast.File, info *types.Info) *ast.File {
 			switch obj.(type) {
 			case *types.Var:
 			case *types.Const:
+			case *types.TypeName:
 			case *types.Func:
 				switch node.Name {
 				case "main", "init":
@@ -302,7 +303,15 @@ func transformGoFile(file *ast.File, info *types.Info) *ast.File {
 			default:
 				return true // we only want to rename the above
 			}
-			path := obj.Pkg().Path()
+			pkg := obj.Pkg()
+			if pkg == nil {
+				return true // universe scope
+			}
+			path := pkg.Path()
+			if !strings.Contains(path, ".") {
+				return true // std isn't transformed
+			}
+
 			buildID := buildInfo.buildID
 			if id := buildInfo.imports[path].buildID; id != "" {
 				buildID = id
diff --git a/testdata/scripts/basic.txt b/testdata/scripts/basic.txt
index 83cf5c9..a5133a8 100644
--- a/testdata/scripts/basic.txt
+++ b/testdata/scripts/basic.txt
@@ -32,8 +32,10 @@ exec readelf --section-headers main
 ! grep 'globalFunc' main
 
 # Finally, check that the 'garble build' shortcut works.
+# cp main main_old
 garble build main.go
 ! grep 'globalVar' main
+# cmp main main_old
 
 -- main.go --
 package main
diff --git a/testdata/scripts/imports.txt b/testdata/scripts/imports.txt
index 9217ee8..45962c9 100644
--- a/testdata/scripts/imports.txt
+++ b/testdata/scripts/imports.txt
@@ -1,24 +1,43 @@
 garble build
 exec ./main
-cmp stderr main.stderr
+cmp stdout main.stdout
+
+! grep 'ImportedVar' main
+! grep 'ImportedConst' main
+! grep 'ImportedFunc' main
+! grep 'ImportedType' main
 
 -- go.mod --
 module foo.com/main
 -- main.go --
 package main
 
-import "foo.com/main/imported"
+import (
+	"fmt"
+	"foo.com/main/imported"
+)
 
 func main() {
-	println(imported.ImportedVar)
-	println(imported.ImportedConst)
+	fmt.Println(imported.ImportedVar)
+	fmt.Println(imported.ImportedConst)
+	imported.ImportedFunc('x')
+	fmt.Println(imported.ImportedType(3))
+	fmt.Println(nil)
 }
--- main.stderr --
+-- main.stdout --
 imported var value
 imported const value
+3
+<nil>
 -- imported/imported.go --
 package imported
 
 var ImportedVar = "imported var value"
 
 const ImportedConst = "imported const value"
+
+func ImportedFunc(param rune) string {
+	return string(param)
+}
+
+type ImportedType int