X509: CS adjustments