Various fixes for comparisons and combining dumps.