Fixup prep for being installed