Fix some CS issues caused by last merges
Merge pull request #2156 from stloyd/bugfix/cs

Fix some CS issues caused by last merges