diff --git a/.gitmodules b/.gitmodules
index 34547fe40..53938f34b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -15,7 +15,7 @@
 	url = git://git.code.sf.net/p/yap/http
 [submodule "packages/clib"]
 	path = packages/clib
-	url = git://git.code.sf.net/p/yap/clib
+	url = sssh://git.code.sf.net/p/yap/clib
 [submodule "packages/sgml"]
 	path = packages/sgml
 	url = git://git.code.sf.net/p/yap/sgml
diff --git a/C/c_interface.c b/C/c_interface.c
index 53601c579..763cdfe8c 100755
--- a/C/c_interface.c
+++ b/C/c_interface.c
@@ -3057,7 +3057,6 @@ YAP_Init(YAP_init_args *yap_init)
       Term t_goal = MkAtomTerm(AtomInitProlog);
       YAP_RunGoalOnce(t_goal);
       Yap_InitYaamRegs( 0 );
-      CurrentModule = LOCAL_SourceModule = USER_MODULE;
       return YAP_BOOT_FROM_SAVED_CODE;
     } else {
       CurrentModule = LOCAL_SourceModule = USER_MODULE;
diff --git a/packages/raptor b/packages/raptor
index b36fdac22..36f99e3c3 160000
--- a/packages/raptor
+++ b/packages/raptor
@@ -1 +1 @@
-Subproject commit b36fdac2281b7eef141095375d81456410dbcd2f
+Subproject commit 36f99e3c3c978fef25f899dc4fab1ffee334d73c