Fixup some things that got out of whack.