Fix more places that should not use ToInteger32