timing fixes