Minor fixes in the AWS template