Fix some CS issues
Merge pull request #2213 from stloyd/bugfix/cs

Fix some CS issues