Some more manifest fixes
Some CSP fixes