Non english edition tweaks

Some tweaks for non-English editions.