yet more packaging cleanups