Cleand up some resharper warnings