[pl] further small segmentation fixes