diff --git a/apitest/apitest.c b/apitest/apitest.c
index 3350b0efcf01e87d0285fc3804a8629c9a5428ac..de13fcd8c87b9939ec955af615904e193b05c827 100644
--- a/apitest/apitest.c
+++ b/apitest/apitest.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-
+#undef exit
 /*
  * apitest
  *
@@ -109,15 +109,17 @@ int main ( int argc, char * *  argv )
             );
         if(n_writ<0)
         {
-            Exit_binary_c_no_stardata(BINARY_C_WRITE_FAILED,
-                                      "snprintf into argstring failed with error %d\n",
-                                      n_writ);
+            fprintf(stderr,
+                    "snprintf into argstring failed with error %d\n",
+                    n_writ);
+            exit(BINARY_C_WRITE_FAILED);
         }
         else if(n_writ >= ARGSTRING_LENGTH-1)
         {
-            Exit_binary_c_no_stardata(BINARY_C_WRITE_FAILED,
-                                      "snprintf into argstring failed because buffer is full (n_writ = %d)\n",
-                                      n_writ);
+            fprintf(stderr,
+                    "snprintf into argstring failed because buffer is full (n_writ = %d)\n",
+                    n_writ);
+            exit(BINARY_C_WRITE_FAILED);
         }
 
         printf("argstring : %s\n",argstring);
@@ -147,8 +149,7 @@ int main ( int argc, char * *  argv )
                 "/dev/null",
                 STRING_LENGTH-1);
 
-        stardata[i]->preferences->internal_buffering = 2;
-        stardata[i]->preferences->internal_buffering_compression = 0;
+        stardata[i]->preferences->internal_buffering = INTERNAL_BUFFERING_STORE;
         stardata[i]->preferences->batchmode = BATCHMODE_LIBRARY;
     }
     free(argstring);
@@ -215,7 +216,7 @@ int main ( int argc, char * *  argv )
     /* free memory */
     for(i=0;i<N;i++)
     {
-        binary_c_free_memory(stardata+i,TRUE,TRUE,FALSE);
+        binary_c_free_memory(stardata+i,TRUE,TRUE,FALSE,TRUE);
     }
     binary_c_free_store_contents(store);
     APIprint("API test finished\n");
diff --git a/src/setup/set_default_preferences.c b/src/setup/set_default_preferences.c
index d4ff10033ee7153284986cc2998eaf1465459124..db65bd79113616bfbda1ae7bd07bb78565b8cb88 100644
--- a/src/setup/set_default_preferences.c
+++ b/src/setup/set_default_preferences.c
@@ -422,4 +422,4 @@ preferences->WD_accretion_rate_novae_upper_limit_other_donor = ACCRETION_RATE_NO
     preferences->gaia_Teff_binwidth = 0.1;
     preferences->gaia_L_binwidth = 0.1;
 #endif//GAIAHRD
-    }
+}
diff --git a/tbse b/tbse
index 70da79514fa159e4d4b61b0d3a2215c8f132756b..84052425514fac1cbf4d20a75b0d995f8957fdfc 100755
--- a/tbse
+++ b/tbse
@@ -1022,7 +1022,7 @@ WDWD_MERGER_ALGORITHM=WDWD_MERGER_ALGORITHM_PERETS2019
 POST_SN_ORBIT_METHOD=POST_SN_ORBIT_TT98
 
 # use monte-carlo kicks by default
-MONTE_CARLO_KICKS=1
+MONTE_CARLO_KICKS=True
 
 ######
 # Supernova kick distribution types.