Packaging minor fixes