Packaging update
Packaging fixes