Packaging fixes

Please pull, a couple of packaging fixes.