Fixes for emoji