Fixed master schedule and others