Fixed bunch of CS errors