chg: Some more timing tweaks