Some timing fixes.