Fixes to timetable