[pl] more fixes