Fixup feature packaging