Fixes to vars.xml and security groups