Timing fixes for engine update