Timing fixes