SOC-1 CSS improvements