Resharper solution issues fixed