More translator fixes