Minor Timing Tweaks