Untested utf-fixes