Resource group fixes