Corrected for the few char warnings left