Fix a few more subtraction related bugs