Fix a few more subtraction related bugs

Benchmarks seem to be fine.