Try to make AWS work
More aws changes