Cloudformation fixes