Fix random CS issues.
Merge pull request #1762 from stloyd/bugfix/cs

Fix random CS issues.