More CA/SA fixes