Other fixes for translation