Resharper fixes