Quick fixes to old references.