Fix ML utf-8 issues