Fixed UTF-8 issues

Change-Id: I0cac91768271ef2698d3b520610da526f3a5d690