More fixes to NRPE integration.