[ca] Small improvements