Merge "Fix integer overflows" into nyc-dev