Some fixes for UTF8.