Fix timings and other stuff