Star harvester NBT saving and other cleanups