A slew of permission changes. EC2 stuff disabled for now