diff --git a/Assistant/Upgrade.hs b/Assistant/Upgrade.hs
index 40bef041a1..1440af10d0 100644
--- a/Assistant/Upgrade.hs
+++ b/Assistant/Upgrade.hs
@@ -165,7 +165,7 @@ upgradeToDistribution newdir cleanup distributionfile = do
 	{- OS X uses a dmg, so mount it, and copy the contents into place. -}
 	unpack = liftIO $ do
 		olddir <- oldVersionLocation
-		withTmpDirIn (parentDir newdir) (toOsPath "git-annex.upgrade") $ \tmpdir -> do
+		withTmpDirIn (fromRawFilePath (parentDir (toRawFilePath newdir))) (toOsPath (toRawFilePath "git-annex.upgrade")) $ \tmpdir -> do
 			void $ boolSystem "hdiutil"
 				[ Param "attach", File distributionfile
 				, Param "-mountpoint", File tmpdir
diff --git a/Utility/Gpg.hs b/Utility/Gpg.hs
index 763028e7dc..c7f5fe7644 100644
--- a/Utility/Gpg.hs
+++ b/Utility/Gpg.hs
@@ -182,7 +182,7 @@ feedRead cmd params passphrase feeder reader = do
 	withTmpFile (toOsPath "gpg") $ \tmpfile h -> do
 		liftIO $ B.hPutStr h passphrase
 		liftIO $ hClose h
-		let passphrasefile = [Param "--passphrase-file", File (fromosPath tmpfile)]
+		let passphrasefile = [Param "--passphrase-file", File (fromOsPath tmpfile)]
 		go $ passphrasefile ++ params
 #endif
   where
diff --git a/Utility/StatelessOpenPGP.hs b/Utility/StatelessOpenPGP.hs
index d3709baa27..205fa91ff8 100644
--- a/Utility/StatelessOpenPGP.hs
+++ b/Utility/StatelessOpenPGP.hs
@@ -27,7 +27,6 @@ import System.Posix.Types
 import System.Posix.IO
 #else
 import Utility.Tmp
-import Utility.OsPath
 #endif
 import Utility.Tmp.Dir
 import Author