diff --git a/GitQueue.hs b/GitQueue.hs
index 097516c195..dfe2976da1 100644
--- a/GitQueue.hs
+++ b/GitQueue.hs
@@ -60,8 +60,7 @@ run repo (Queue _ m) = do
  -
  - Complicated by commandline length limits. -}
 runAction :: Git.Repo -> Action -> [FilePath] -> IO ()
-runAction repo action files = do
-	unless (null files) runxargs
+runAction repo action files = unless (null files) runxargs
 	where
 		runxargs = pOpen WriteToPipe "xargs" ("-0":"git":params) feedxargs
 		params = toCommand $ Git.gitCommandLine repo
diff --git a/Remote/Git.hs b/Remote/Git.hs
index c1423bef7a..a458455109 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -54,13 +54,15 @@ gen r u _ = do
 		(False, "") -> tryGitConfigRead r
 		_ -> return r
 
+	u' <- getUUID r'
+
 	let defcst = if not $ Git.repoIsUrl r
 		then cheapRemoteCost
 		else expensiveRemoteCost
 	cst <- remoteCost r' defcst
 
 	return $ Remote {
-		uuid = u,
+		uuid = u',
 		cost = cst,
 		name = Git.repoDescribe r',
 		storeKey = copyToRemote r',