These two patches go after the last 27 patches, fixing up some mistakes I made earlier.