CA related fixes