Start/end time override improvements