Fix compile error and enabled PnPMGR