Minor fixes to CS