Small fixes for ca and it