diff --git a/Dockerfile.dev b/_Dockerfile.dev
similarity index 100%
rename from Dockerfile.dev
rename to _Dockerfile.dev
diff --git a/docker-compose.yml b/docker-compose.yml
index ab2b2f1cab..78b1e15c26 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,7 +27,7 @@ services:
         - redis
         build:
             context: .
-            dockerfile: Dockerfile.dev
+            dockerfile: _Dockerfile.dev
         ports:
         - 4141:4141
         volumes:
diff --git a/server/core/db/boltdb.go b/server/core/db/boltdb.go
index 79e0798c29..c625b4d30e 100644
--- a/server/core/db/boltdb.go
+++ b/server/core/db/boltdb.go
@@ -163,7 +163,7 @@ func (b *BoltDB) List() ([]models.ProjectLock, error) {
 	for k, v := range locksBytes {
 		var lock models.ProjectLock
 		if err := json.Unmarshal(v, &lock); err != nil {
-			return locks, errors.Wrap(err, fmt.Sprintf("failed to deserialize lock at key '%d'", k))
+			return locks, errors.Wrap(err, fmt.Sprintf("failed to deserialize lock at key %q", fmt.Sprint(k)))
 		}
 		locks = append(locks, lock)
 	}
diff --git a/server/events/mock_workingdir_test.go b/server/events/mock_workingdir_test.go
index a65b7e219f..82dd98d82f 100644
--- a/server/events/mock_workingdir_test.go
+++ b/server/events/mock_workingdir_test.go
@@ -295,6 +295,10 @@ func (c *MockWorkingDir_Clone_OngoingVerification) GetAllCapturedArguments() (_p
 		for u, param := range params[3] {
 			_param3[u] = param.([]string)
 		}
+		_param4 = make([][]string, len(c.methodInvocations))
+		for u, param := range params[4] {
+			_param4[u] = param.([]string)
+		}
 	}
 	return
 }
diff --git a/server/events/mocks/mock_working_dir.go b/server/events/mocks/mock_working_dir.go
index 468a65865c..74eb176631 100644
--- a/server/events/mocks/mock_working_dir.go
+++ b/server/events/mocks/mock_working_dir.go
@@ -295,6 +295,10 @@ func (c *MockWorkingDir_Clone_OngoingVerification) GetAllCapturedArguments() (_p
 		for u, param := range params[3] {
 			_param3[u] = param.([]string)
 		}
+		_param4 = make([][]string, len(c.methodInvocations))
+		for u, param := range params[4] {
+			_param4[u] = param.([]string)
+		}
 	}
 	return
 }
diff --git a/server/events/project_command_builder.go b/server/events/project_command_builder.go
index b2b518738b..9d75265209 100644
--- a/server/events/project_command_builder.go
+++ b/server/events/project_command_builder.go
@@ -3,6 +3,7 @@ package events
 import (
 	"fmt"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"sort"
 	"strings"