Minor integer overflow fixes.