Fixes to emoji