p5100, p5110, huashan fixup