diff --git a/src/engine.c b/src/engine.c
index bdfaa1813401a59eb01a87178e290c7accd21389..e54c39b9166a0579206007bb3b0e7b0fa21f70ec 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -97,7 +97,6 @@ static cpu_set_t entry_affinity;
  *
  * @return The new #link pointer.
  */
-
 struct link *engine_addlink(struct engine *e, struct link *l, struct task *t) {
 
   const int ind = atomic_inc(&e->nr_links);
@@ -1537,7 +1536,6 @@ void engine_maketasks(struct engine *e) {
  *
  * @return 1 if the space has to be rebuilt, 0 otherwise.
  */
-
 int engine_marktasks(struct engine *e) {
 
   struct scheduler *s = &e->sched;
@@ -1756,7 +1754,6 @@ void engine_prepare(struct engine *e) {
     error("Failed to aggregate the rebuild flag across nodes.");
   rebuild = buff;
 #endif
-  e->tic_step = getticks();
 
   /* Did this not go through? */
   if (rebuild) {
@@ -2107,6 +2104,7 @@ void engine_init_particles(struct engine *e) {
   engine_prepare(e);
 
   engine_marktasks(e);
+
   /* Build the masks corresponding to the policy */
   unsigned int mask = 0;
   unsigned int submask = 0;
diff --git a/src/hydro/Default/hydro_debug.h b/src/hydro/Default/hydro_debug.h
index 79ee392d46ca75a2c097bf045b2d82c9f3dc96c0..9b8136e8349398e4e9e804459a5de23d21043564 100644
--- a/src/hydro/Default/hydro_debug.h
+++ b/src/hydro/Default/hydro_debug.h
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 __attribute__((always_inline)) INLINE static void hydro_debug_particle(
-    struct part* p, struct xpart* xp) {
+    const struct part* p, const struct xpart* xp) {
   printf(
       "x=[%.3e,%.3e,%.3e], "
       "v=[%.3e,%.3e,%.3e],v_full=[%.3e,%.3e,%.3e] \n a=[%.3e,%.3e,%.3e],\n "
diff --git a/src/hydro/Minimal/hydro_debug.h b/src/hydro/Minimal/hydro_debug.h
index 127ba75e99418b6a5dc197a44ccdc77de3cdef15..1e0e3f1f111149a3babeef431893dff2cbe6bb3c 100644
--- a/src/hydro/Minimal/hydro_debug.h
+++ b/src/hydro/Minimal/hydro_debug.h
@@ -18,7 +18,7 @@
  ******************************************************************************/
 
 __attribute__((always_inline)) INLINE static void hydro_debug_particle(
-    struct part* p, struct xpart* xp) {
+    const struct part* p, const struct xpart* xp) {
   printf(
       "x=[%.3e,%.3e,%.3e], "
       "v=[%.3e,%.3e,%.3e],v_full=[%.3e,%.3e,%.3e] \n a=[%.3e,%.3e,%.3e], "
diff --git a/src/runner.c b/src/runner.c
index c28b62edf17f07ac9a68bc3c1485d6fd8b8ba445..53a80030fff74a10f311551a0ad52d83ddeff2b2 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -929,7 +929,6 @@ void runner_do_kick(struct runner *r, struct cell *c, int timer) {
       ti_end_min = min(p->ti_end, ti_end_min);
       ti_end_max = max(p->ti_end, ti_end_max);
     }
-
   }
 
   /* Otherwise, aggregate data from children. */
@@ -1009,7 +1008,6 @@ void runner_do_recv_cell(struct runner *r, struct cell *c, int timer) {
  *
  * @param data A pointer to this thread's data.
  */
-
 void *runner_main(void *data) {
 
   struct runner *r = (struct runner *)data;
diff --git a/src/tools.c b/src/tools.c
index 3931775608c9093f44401a91495850ab7337d5e6..710efd7e4dd54784ed735492b4e1af0b466ef682 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -288,8 +288,8 @@ void self_all_density(struct runner *r, struct cell *ci) {
 }
 
 void pairs_single_grav(double *dim, long long int pid,
-                       struct gpart *restrict gparts,
-                       const struct part *parts, int N, int periodic) {
+                       struct gpart *restrict gparts, const struct part *parts,
+                       int N, int periodic) {
 
   int i, k;
   // int mj, mk;