Fixes for UTF-8 handling of combining marks