More timing fixes.