CS.
Some small fixes.