diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai
index 7e7556248e..c9390d67ce 100755
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -683,21 +683,7 @@ function main() {
           $build_dir coding \
           libcoding.so $dbin/libcoding.so
 
-        #check if we run inside a container or not
-        #IS_CONTAINER variable is defined in build_helper file
-        #compile  nasmesh and rb_tool only if NOT running in a container
-        if [ $IS_CONTAINER -eq 0 ]
-        then
-          compilations \
-            $build_dir nasmesh \
-            CMakeFiles/nasmesh/nasmesh.ko $dbin/nasmesh.ko
 
-          compilations \
-            $build_dir rb_tool \
-            rb_tool $dbin/rb_tool
-
-          cp $OPENAIR_DIR/cmake_targets/tools/init_nas_nos1 $dbin
-        fi #IS_CONTAINER
       fi
     fi
   fi
diff --git a/executables/softmodem-common.c b/executables/softmodem-common.c
index fa6b674765..e10515ea1a 100644
--- a/executables/softmodem-common.c
+++ b/executables/softmodem-common.c
@@ -89,7 +89,7 @@ void get_common_options(uint32_t execmask) {
   uint32_t online_log_messages=0;
   uint32_t glog_level=0 ;
   uint32_t start_telnetsrv = 0, start_telnetclt = 0;
-  uint32_t noS1 = 0, nokrnmod = 0, nonbiot = 0;
+  uint32_t noS1 = 0, nokrnmod = 1, nonbiot = 0;
   uint32_t rfsim = 0, basicsim = 0, do_forms = 0;
   char *logmem_filename = NULL;
   paramdef_t cmdline_params[] =CMDLINE_PARAMS_DESC ;