Bundling/packaging fixes