Fixup packaging rules, add tab