Updates after EC2 integration testing.