cs fixes

strangely, this is not detected by any sniff.