Fixed char/int issues