More fixes for pjlink