More Diff Calculation fixes