diff --git a/src/engine.h b/src/engine.h
index d556ae88ef386a6d81a658a61d76c43d9f87c83a..13929ed7bed07681da7c84a1f7ca95bc73527b82 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -412,7 +412,7 @@ void engine_clean(struct engine *e);
 int engine_estimate_nr_tasks(struct engine *e);
 
 #ifdef HAVE_SETAFFINITY
-cpu_set_t *engine_entry_affinity();
+cpu_set_t *engine_entry_affinity(void);
 #endif
 
 /* Struct dump/restore support. */
diff --git a/src/physical_constants.c b/src/physical_constants.c
index 3936d07f4207263a4c391715ab0a8dd9ded6fa6d..d6480c37e0aa1ed8f330f4dbac6e46b586df141d 100644
--- a/src/physical_constants.c
+++ b/src/physical_constants.c
@@ -48,8 +48,8 @@ void phys_const_init(const struct unit_system *us, struct swift_params *params,
       const_newton_G_cgs / units_general_cgs_conversion_factor(us, dimension_G);
 
   /* Overwrite G if present in the file */
-  internal_const->const_newton_G = parser_get_opt_param_double(
-      params, "PhysicalConstants:G", internal_const->const_newton_G);
+  //internal_const->const_newton_G = parser_get_opt_param_double(
+  //    params, "PhysicalConstants:G", internal_const->const_newton_G);
 
   const float dimension_c[5] = {0, 1, -1, 0, 0}; /* [cm s^-1] */
   internal_const->const_speed_light_c =
diff --git a/src/velociraptor_interface.c b/src/velociraptor_interface.c
index ad20c288def6f7b1a5c39e292bea3c4efb157e2f..caf18ac36c6228ff6cfef3a8706b704e94c96979 100644
--- a/src/velociraptor_interface.c
+++ b/src/velociraptor_interface.c
@@ -82,8 +82,7 @@ void velociraptor_init(struct engine *e) {
     e->stf_conv_fac->velocitytokms = units_conversion_factor(e->internal_units, e->stf_units, UNIT_CONV_SPEED); /* 1km/s <=> 1e5cm/s */
     e->stf_conv_fac->masstosolarmass = units_conversion_factor(e->internal_units, e->stf_units, UNIT_CONV_MASS); /* 1M_sol <=> 1.99e33g */
     e->stf_conv_fac->energyperunitmass = units_conversion_factor(e->internal_units, e->stf_units, UNIT_CONV_ENERGY_PER_UNIT_MASS); /* Conversion for gravitational potential. */
-    //e->stf_conv_fac->gravity = vel_const.const_newton_G; /* TODO: G = 6.67408e-8 (cgs) */
-    e->stf_conv_fac->gravity = 4.302051e-06; /* TODO: G = 6.67408e-8 (cgs) */
+    e->stf_conv_fac->gravity = vel_const.const_newton_G; /* TODO: G = 6.67408e-8 (cgs) */
     e->stf_conv_fac->hubbleunit = e->cosmology->H; /* TODO: double check this. */
     unit_info = *e->stf_conv_fac;