corrected references to other entities