Minor cleanups for packaging