Fix more timings problems