Fix a few more unicode issues

Change-Id: I722973a852f659f62e21cbe3c1cb4fe6f9bfb80d