More CA fixes