Additional AWS changes