package bugfixes for clean stop and purge