Updating things to work on AWS.