Fixed timings and other stuff