Fixed recent emoji problems