A couple tweaks to start/end times