Small packaging fixes