more AWS fixes