assorted fixes

Found a few bugs in working on the correspondence pipeline that I think are worth getting fixed in isolation.