Fixes on emoticons