[ca] Improved several rules