Adapt to use the new integer type and to pass stricter overflow checks

Adapt to use the new integer type and to pass stricter overflow checks #2456