[2.3] More cs fixes