Fixes for ca and new ca classes.