CS Fixes for pull request