Timing tweaks