Fixup a few things.