Fixed more invalid references.