Changes to get AWS services running.