Fixup some little bugs.