diff --git a/Assistant/WebApp/Configurators/AWS.hs b/Assistant/WebApp/Configurators/AWS.hs
index 45f9d773ac..bec3123f89 100644
--- a/Assistant/WebApp/Configurators/AWS.hs
+++ b/Assistant/WebApp/Configurators/AWS.hs
@@ -13,12 +13,12 @@ import Assistant.WebApp.Common
 import Assistant.WebApp.MakeRemote
 #ifdef WITH_S3
 import qualified Remote.S3 as S3
-#endif
-import qualified Remote.Glacier as Glacier
-import qualified Remote.Helper.AWS as AWS
 import Logs.Remote
 import qualified Remote
 import qualified Types.Remote as Remote
+#endif
+import qualified Remote.Glacier as Glacier
+import qualified Remote.Helper.AWS as AWS
 import Types.Remote (RemoteConfig)
 import Types.StandardGroups
 import Creds
diff --git a/Assistant/WebApp/Configurators/Edit.hs b/Assistant/WebApp/Configurators/Edit.hs
index 4d4008c327..3a9dc78c9f 100644
--- a/Assistant/WebApp/Configurators/Edit.hs
+++ b/Assistant/WebApp/Configurators/Edit.hs
@@ -19,8 +19,8 @@ import Assistant.ScanRemotes
 import Assistant.Sync
 import Assistant.Alert
 import qualified Assistant.WebApp.Configurators.AWS as AWS
-import qualified Assistant.WebApp.Configurators.IA as IA
 #ifdef WITH_S3
+import qualified Assistant.WebApp.Configurators.IA as IA
 import qualified Remote.S3 as S3
 #endif
 import qualified Remote
diff --git a/Assistant/WebApp/Configurators/IA.hs b/Assistant/WebApp/Configurators/IA.hs
index 38bbc2ab3f..a6816958e7 100644
--- a/Assistant/WebApp/Configurators/IA.hs
+++ b/Assistant/WebApp/Configurators/IA.hs
@@ -15,15 +15,15 @@ import qualified Assistant.WebApp.Configurators.AWS as AWS
 import qualified Remote.S3 as S3
 import qualified Remote.Helper.AWS as AWS
 import Assistant.WebApp.MakeRemote
-#endif
 import qualified Remote
 import qualified Types.Remote as Remote
 import Types.StandardGroups
-import Types.Remote (RemoteConfig)
 import Logs.Remote
+import Assistant.Gpg
+#endif
+import Types.Remote (RemoteConfig)
 import qualified Annex.Url as Url
 import Creds
-import Assistant.Gpg
 
 import qualified Data.Text as T
 import qualified Data.Map as M
diff --git a/Git/FileMode.hs b/Git/FileMode.hs
index c3dfe570ac..b07fd302c4 100644
--- a/Git/FileMode.hs
+++ b/Git/FileMode.hs
@@ -11,8 +11,6 @@ module Git.FileMode where
 
 import Utility.FileMode
 
-import System.PosixCompat.Types
-
 symLinkMode :: FileMode
 symLinkMode = 40960
 
diff --git a/Remote/Git.hs b/Remote/Git.hs
index c80a0d1c61..1c2573642d 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -707,5 +707,5 @@ mkCopier remotewanthardlink rsyncparams = do
 		, return copier
 		)
 #else
-	return copier
+	return $ if remotewanthardlink then copier else copier
 #endif