Minor changes to MasterController