diff --git a/cmd/fossa/config.go b/cmd/fossa/config.go
index 7d8e627dff..195e2416df 100644
--- a/cmd/fossa/config.go
+++ b/cmd/fossa/config.go
@@ -86,7 +86,7 @@ func setDefaultValues(c Config) (Config, error) {
 
 	// Load API key from environment variable.
 	if len(c.CLI.APIKey) == 0 {
-		c.CLI.APIKey = os.Getenv("FOSSA_CLI_API_KEY")
+		c.CLI.APIKey = os.Getenv("FOSSA_API_KEY")
 	}
 
 	// Infer default locator and project from `git`.
@@ -113,7 +113,7 @@ func setDefaultValues(c Config) (Config, error) {
 		if err != nil {
 			return c, err
 		}
-		c.CLI.Locator = project + "$" + revision.Hash().String()
+		c.CLI.Locator = "git+" + project + "$" + revision.Hash().String()
 	}
 
 	return c, nil
diff --git a/cmd/fossa/main.go b/cmd/fossa/main.go
index 92c82ed63d..f63648ffac 100644
--- a/cmd/fossa/main.go
+++ b/cmd/fossa/main.go
@@ -186,11 +186,12 @@ func BuildCmd(_ *cli.Context) {
 		if err != nil {
 			log.Logger.Fatalf("Could not upload build results: %s\n", err.Error())
 		}
+		fmt.Print("build & upload succeeded")
 	} else {
 		fmt.Print(string(build))
 	}
 
-	fmt.Println("BUILD OK")
+	log.Logger.Debug("BUILD OK")
 }
 
 func doBuild(config Config) ([]byte, error) {