Entity packages, small cleanups