PNA / PC fix broken build