Fix Stylecop errors
Don't have the infrastructure yet to provide my own Stylecop settings file
Merge branch 'Stylecop-Fix'