fix some uchar/char conflicts