Timetable edit fix & suppress warning!