Various AWS fixes