Fixed some mishandled references.