more aws fixes