Improved UTF-8 compatibility