Fixed bunch of CS errors for release
7 files changed