diff --git a/cmd/buildah/commit.go b/cmd/buildah/commit.go
index 0c17fe70..dc33f142 100644
--- a/cmd/buildah/commit.go
+++ b/cmd/buildah/commit.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/containers/image/transports"
+	"github.com/containers/image/transports/alltransports"
 	"github.com/containers/storage/pkg/archive"
 	"github.com/projectatomic/buildah"
 	"github.com/urfave/cli"
@@ -90,7 +90,7 @@ func commitCmd(c *cli.Context) error {
 		return fmt.Errorf("error reading build container %q: %v", name, err)
 	}
 
-	dest, err := transports.ParseImageName(output)
+	dest, err := alltransports.ParseImageName(output)
 	if err != nil {
 		return fmt.Errorf("error parsing target image name %q: %v", output, err)
 	}
diff --git a/image.go b/image.go
index 906c5ec2..41c24ea4 100644
--- a/image.go
+++ b/image.go
@@ -255,11 +255,12 @@ func (i *containerImageRef) Transport() types.ImageTransport {
 	return is.Transport
 }
 
-func (i *containerImageSource) Close() {
+func (i *containerImageSource) Close() error {
 	err := os.RemoveAll(i.path)
 	if err != nil {
 		logrus.Errorf("error removing %q: %v", i.path, err)
 	}
+	return err
 }
 
 func (i *containerImageSource) Reference() types.ImageReference {
diff --git a/pull.go b/pull.go
index 1f6f24c8..5d71d6d2 100644
--- a/pull.go
+++ b/pull.go
@@ -8,7 +8,7 @@ import (
 	"github.com/containers/image/docker/reference"
 	"github.com/containers/image/signature"
 	is "github.com/containers/image/storage"
-	"github.com/containers/image/transports"
+	"github.com/containers/image/transports/alltransports"
 	"github.com/containers/image/types"
 	"github.com/containers/storage/storage"
 )
@@ -21,9 +21,9 @@ func pullImage(store storage.Store, options BuilderOptions, sc *types.SystemCont
 		spec = options.Registry + spec
 	}
 
-	srcRef, err := transports.ParseImageName(name)
+	srcRef, err := alltransports.ParseImageName(name)
 	if err != nil {
-		srcRef2, err2 := transports.ParseImageName(spec)
+		srcRef2, err2 := alltransports.ParseImageName(spec)
 		if err2 != nil {
 			return fmt.Errorf("error parsing image name %q: %v", spec, err2)
 		}