Fixes to timing