Lots of timing fixes