diff --git a/download.go b/download.go
index f347b64a..a5cdbd16 100644
--- a/download.go
+++ b/download.go
@@ -99,12 +99,6 @@ func gitMerge(path string, name string) error {
 	return nil
 }
 
-func gitDiff(path string, name string) error {
-	err := show(passToGit(filepath.Join(path, name), "diff", "HEAD..HEAD@{upstream}"))
-
-	return err
-}
-
 // DownloadAndUnpack downloads url tgz and extracts to path.
 func downloadAndUnpack(url string, path string) error {
 	err := os.MkdirAll(path, 0755)
@@ -140,6 +134,10 @@ func getPkgbuilds(pkgs []string) error {
 	pkgs = removeInvalidTargets(pkgs)
 	aur, repo, err := packageSlices(pkgs)
 
+	if err != nil {
+		return err
+	}
+
 	for n := range aur {
 		_, pkg := splitDBFromName(aur[n])
 		aur[n] = pkg
diff --git a/exec.go b/exec.go
index 3b643aac..f0364dfc 100644
--- a/exec.go
+++ b/exec.go
@@ -98,10 +98,6 @@ func passToPacman(args *arguments) *exec.Cmd {
 }
 
 func passToMakepkg(dir string, args ...string) *exec.Cmd {
-	if config.NoConfirm {
-		args = append(args)
-	}
-
 	mflags := strings.Fields(config.MFlags)
 	args = append(args, mflags...)
 
diff --git a/keys.go b/keys.go
index 968fda13..d7ae4ab2 100644
--- a/keys.go
+++ b/keys.go
@@ -114,7 +114,7 @@ func formatKeysToImport(keys pgpKeySet) (string, error) {
 		for _, base := range bases {
 			pkglist += base.String() + "  "
 		}
-		pkglist = strings.TrimRight(pkglist, "  ")
+		pkglist = strings.TrimRight(pkglist, " ")
 		buffer.WriteString(fmt.Sprintf("\n%s %s, required by: %s", yellow(bold(smallArrow)), cyan(key), cyan(pkglist)))
 	}
 	return buffer.String(), nil