Various fixes for translations