More char fixes
More char fixes