Final fixes for new security groups