Attempt to fix issues with hours past midnight and make end times exclusive