More timing fixes