Fix few more c-string to unicode strings