Packaging Improvements

Address some outstanding packaging issues.