Some timing fixes