Fixing most of references.