Tweaks to timing and messages