Fix more Resharper issues