Crypt: CS adjustments