Some changes to get rid of multiple masters for now.