fixup a couple things