Fixes some more csp errors
rebased onto 9571d91a34259cc20356d48917c645241e6b4386
Since none of these are tested in the tests, I'm going to merge this directly :)
Pull-Request has been merged by pingou
Fixes some more csp errors