Czech fixups

Supersedes #5781 and #5842.