Actually fixed references to deleted items