[ca] Fixed false alarms, improved rules