Fixing AWS stuff