ReSharper fixes