Some more fixes for translation