Packaging related fixes.