Cleanup, fix up package spec