Translation changes and fixes