More char fixes