More CSP fixes