Various packaging enhancements