diff --git a/libmuttonserver.go b/libmuttonserver.go
index c653fab..88190a8 100644
--- a/libmuttonserver.go
+++ b/libmuttonserver.go
@@ -6,7 +6,6 @@ import (
 	"github.com/rwinkhart/MUTN/src/cli"
 	"github.com/rwinkhart/MUTN/src/sync"
 	"os"
-	"strconv"
 	"strings"
 )
 
@@ -19,8 +18,7 @@ func main() {
 	switch args[1] {
 	case "fetch":
 		// print all information needed for syncing to stdout for interpretation by the client
-		clientIsWindows, _ := strconv.ParseBool(args[3])
-		sync.GetRemoteDataFromServer(args[2], clientIsWindows)
+		sync.GetRemoteDataFromServer(args[2])
 	case "shear":
 		// shear an entry from the server and add it to the deletions directory
 		deviceIDTargetLocation := strings.Split(args[2], "\x1d")
diff --git a/mutn.go b/mutn.go
index 9a1023f..2f765bc 100644
--- a/mutn.go
+++ b/mutn.go
@@ -24,7 +24,7 @@ func main() {
 		if strings.HasPrefix(args[1], "/") {
 
 			// store location of target entry
-			targetLocation := backend.TargetLocationFormat(args[1][1:])
+			targetLocation := backend.TargetLocationFormat(args[1])
 
 			// entry reader shortcut (if no other arguments are supplied)
 			if argsCount == 2 {
diff --git a/src/cli/edit.go b/src/cli/edit.go
index c8cfa54..ea600a6 100644
--- a/src/cli/edit.go
+++ b/src/cli/edit.go
@@ -16,7 +16,7 @@ func RenameCli(oldLocation string) {
 	backend.TargetIsFile(oldLocation, true, 0)
 
 	// prompt user for new location and rename
-	newLocation := backend.EntryRoot + backend.PathSeparator + input("New location:")
+	newLocation := backend.TargetLocationFormat(input("New location:"))
 	backend.Rename(oldLocation, newLocation)
 
 	// exit is done from backend.Rename