latest Polish fixes