Merge "Fix signedness mismatch and integer underflow"