Some more changes to get EC2 instance creation with multiple interfaces working