diff --git a/control/auxiliary.c b/control/auxiliary.c
index 5f90b85afc4a93d915ca8f2a9ae80830226341c2..86f081b0399a0f67eafb49436f4c579cd6bbfdb0 100644
--- a/control/auxiliary.c
+++ b/control/auxiliary.c
@@ -51,10 +51,12 @@ void chameleon_warning(const char *func_name, const char *msg_text)
     CHAM_context_t *chamctxt;
 
     chamctxt = chameleon_context_self();
-    if (chamctxt == NULL)
+    if (chamctxt == NULL) {
         chameleon_fatal_error("chameleon_warning", "CHAMELEON not initialized");
-    if (chamctxt->warnings_enabled)
+    }
+    if (chamctxt->warnings_enabled) {
         fprintf(stderr, "CHAMELEON WARNING: %s(): %s\n", func_name, msg_text);
+    }
 }
 
 /**
diff --git a/control/context.c b/control/context.c
index fa0dcd2502c795edde63b2a73153ae263db1b15b..6698189e803d29dcbcfac7400615dc38d8f74652 100644
--- a/control/context.c
+++ b/control/context.c
@@ -168,7 +168,7 @@ int CHAMELEON_Enable(int option)
     }
 
     /* Enable at the lower level if required */
-    RUNTIME_enable( option );
+    RUNTIME_enable( chamctxt->schedopt, option );
 
     return CHAMELEON_SUCCESS;
 }
@@ -231,7 +231,7 @@ int CHAMELEON_Disable(int option)
     }
 
     /* Disable at the lower level if required */
-    RUNTIME_disable( option );
+    RUNTIME_disable( chamctxt->schedopt, option );
 
     return CHAMELEON_SUCCESS;
 }