[2818] Fix some emote texts

Also fix a unit flag from previous commit