diff --git a/extra/comp_err.c b/extra/comp_err.c
index 3e540d8f481..f2d486487ff 100644
--- a/extra/comp_err.c
+++ b/extra/comp_err.c
@@ -167,6 +167,7 @@ int main(int argc, char *argv[])
     DBUG_ENTER("main");
 
     charsets_dir= DEFAULT_CHARSET_DIR;
+    my_umask_dir= 0777;
     if (get_options(&argc, &argv))
       DBUG_RETURN(1);
     if (!(row_count= parse_input_file(TXTFILE, &error_head, &lang_head)))
diff --git a/mysys/my_init.c b/mysys/my_init.c
index b2eefe97ee8..6d1b9ec04be 100644
--- a/mysys/my_init.c
+++ b/mysys/my_init.c
@@ -299,7 +299,7 @@ int handle_rtc_failure(int err_type, const char *file, int line,
 
   return 0; /* Error is handled */
 }
-#pragma runtime_checks("", on)
+#pragma runtime_checks("", restore)
 #endif