Fixing security group bugs

Change-Id: I2390c036a99c8536c37f22f3c77df75d07731cc4