Small fixes to new translation system