Minor bug fixes and update translations
