Changes to work on AWS