Minor emote improvements