Replace some shorts that don't belong with ints.