Intermediate changes for AWS/iPhone testing.