diff --git a/admin/nt/dist-build/emacs.nsi b/admin/nt/dist-build/emacs.nsi
index 9239eb07ec7..13278749871 100644
--- a/admin/nt/dist-build/emacs.nsi
+++ b/admin/nt/dist-build/emacs.nsi
@@ -70,6 +70,9 @@ Section
   # create uninstaller
   WriteUninstaller "$UninstallerPath"
 
+  # request to set x64 registry keys
+  SetRegView 64
+
   # add registry key to enable uninstall from control panel
   WriteRegStr HKLM "${UNINST_KEY}" "DisplayName" "GNU Emacs ${VERSION_BRANCH}"
   WriteRegStr HKLM "${UNINST_KEY}" "DisplayIcon" "$\"$UninstallerPath$\""
diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el
index 51b183de347..0d591791d73 100644
--- a/lisp/cmuscheme.el
+++ b/lisp/cmuscheme.el
@@ -416,7 +416,7 @@ in the next one.")
   (setq scheme-prev-l/c-dir/file (cons (file-name-directory    file-name)
 				       (file-name-nondirectory file-name)))
   (comint-send-string (scheme-proc) (concat "(load \""
-					    file-name
+					    (file-local-name file-name)
 					    "\")\n")))
 
 (defun scheme-compile-file (file-name)
@@ -430,7 +430,7 @@ in the next one.")
   (setq scheme-prev-l/c-dir/file (cons (file-name-directory    file-name)
 				       (file-name-nondirectory file-name)))
   (comint-send-string (scheme-proc) (concat "(compile-file \""
-					    file-name
+					    (file-local-name file-name)
 					    "\")\n")))
 
 
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 74f25403017..1d527d3aa4e 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1752,7 +1752,7 @@ itself responsible for the file (usually because other files in that
 directory are already registered under that backend) will be used to
 register the file.  If no backend declares itself responsible, the
 first backend that could register the file is used."
-  (interactive "P")
+  (interactive)
   (let* ((fileset-arg (or vc-fileset (vc-deduce-fileset nil t)))
          (backend (car fileset-arg))
 	 (files (nth 1 fileset-arg)))