CSP compliency fixes