[AWS] fixes