Dirty, dirty hacks for timing fixes