Sha mismatches

(The branch is jumbled; it should be merged quickly.)