Few tweaks to timing