Add possible fix to Unicode issues and characters