fix these so they work on AWS