diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index 0e7151e5efc..f344b050f4e 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -332,7 +332,7 @@ class MachCommands(CommandBase):
             opts += ["--release"]
 
         env = self.build_env()
-        env["CARGO_TARGET_DIR"] = path.join(self.context.topdir, "target", "geckolib")
+        env["CARGO_TARGET_DIR"] = path.join(self.context.topdir, "target", "geckolib").encode("UTF-8")
 
         build_start = time()
         with cd(path.join("ports", "geckolib")):
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index a814f58fbf9..328d0965b65 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -41,7 +41,9 @@ def host_triple():
         os_type = "apple-darwin"
     elif os_type == "android":
         os_type = "linux-androideabi"
-    elif os_type == "windows" or os_type.startswith("mingw64_nt-") or os_type.startswith("cygwin_nt-"):
+    elif os_type == "windows":
+        os_type = "pc-windows-msvc"
+    elif os_type.startswith("mingw64_nt-") or os_type.startswith("cygwin_nt-"):
         os_type = "pc-windows-gnu"
     elif os_type == "freebsd":
         os_type = "unknown-freebsd"