Fixing Resharper reference mess