Fixes for timeslot