Fix problems on AWS.