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

Fix some CS