CS fix in preparation of release