diff --git a/configure b/configure
index f3186018..2861695f 100755
--- a/configure
+++ b/configure
@@ -276,8 +276,8 @@ EOF
                 rm ${QP_ROOT}/external/opam_installer.sh
                 source ${OPAMROOT}/opam-init/init.sh > /dev/null 2> /dev/null || true
 
-                ${QP_ROOT}/bin/opam init --disable-sandboxing --verbose \
-                    --yes --comp=4.07.0
+                rm $OPAMROOT/config
+                ${QP_ROOT}/bin/opam init --disable-sandboxing --verbose --yes 
 
                 eval $(${QP_ROOT}/bin/opam env)
                 opam install -y ${OCAML_PACKAGES}  || exit 1
diff --git a/scripts/compilation/qp_create_ninja b/scripts/compilation/qp_create_ninja
index 3ae929bb..7a148773 100755
--- a/scripts/compilation/qp_create_ninja
+++ b/scripts/compilation/qp_create_ninja
@@ -538,7 +538,7 @@ def get_binaries(path_module):
     import subprocess
 
     try:
-        cmd = 'grep -l -e "^program " {0}/*.irp.f'.format(path_module.abs)
+        cmd = 'grep -l -e "^\\s*program " {0}/*.irp.f'.format(path_module.abs)
         process = subprocess.Popen([cmd],
                                    shell=True,
                                    stdout=subprocess.PIPE,