Fixes for hive death possibly deleting other things