Changes due to move to AWS hosting