moar cs fixes