Fixed some resharper solution code issues