Moar cs fixes