[pl] changes in disambiguation and small fixes