Minor changes for running on EC2.