Small translation changes and bug fixes