Fixup on AWS.