Fixing several translator issues