Changes to make security groups work for havana & grizzly