Couple of fixes for a UTF-32 build.