Make coll-remove a bit more robust. Restart fix-attributes