Updates for making resharper happy.