Fixed two bugs in emotes