Bug fixes for CA