Final fixes and changes for the cross cloud security groups