2.x compatibility fixes and packaging foam