Some packaging fixes