Modify system and disks collector bugs