Fix emote issues as discussed in #347
Add warning as discussed in #347