little timing fixes