diff --git a/cmd/root.go b/cmd/root.go
index ea40768..da9f4f9 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -337,7 +337,7 @@ func Execute() error {
 // Configures the global logger for Zap so that we can call it from any location
 // in the code without having to pass around a logger instance.
 func configureLogging(logDir string, debug bool) error {
-	if err := os.MkdirAll(path.Join(config.Get().System.LogDirectory, "/install"), 0700); err != nil {
+	if err := os.MkdirAll(path.Join(logDir, "/install"), 0700); err != nil {
 		return errors.WithStack(err)
 	}
 
diff --git a/server/filesystem.go b/server/filesystem.go
index e088aaf..0cb6803 100644
--- a/server/filesystem.go
+++ b/server/filesystem.go
@@ -574,7 +574,8 @@ func (fs *Filesystem) Copy(p string) error {
 	}
 	defer dest.Close()
 
-	if _, err := io.Copy(dest, source); err != nil {
+	buf := make([]byte, 1024*4)
+	if _, err := io.CopyBuffer(dest, source, buf); err != nil {
 		return errors.WithStack(err)
 	}