Various fixes for translations

Unrelated but well commented commits here.