cz and pl fixes