A few fixes for overflow.