Fix typo and import CSP events