Various packaging fixes.