Various fixes to diff washing and discarding