small timing tweaks