Changes required for this to work with AWS, used for training