various cleanups to get ec2 subnet api up to latest