[pl] and even more fixes