More fixes to Nock end-points.