Various packaging related fixes and enhancements