Apply ASUS upstream fixes