Trivial packaging fixes