Fixes to AWS