Timing fixes.