Make the start/end times consistent