Overcoming Critical Issues with Better Master Scheduling