Fixed bunch of CS errors for release