Fixed further code analysis and StyleCop errors