Fixed references to deleted items