Tweaks to time setting