Minor changes to cloudformation template