Fix CS errors
Merge pull request #4357 from bcrowe/3.0-CS

3.0 - Fix CS errors