Packaging changes for release