CA/SA fixes