More CA/SA fixes

Enabled CA on generated files