misc fixes to timing