Fix some more Char / HChar mixups