Small fixes in CS