Minor packaging fixes