Most of the time these are the ones that end up being a potential liability to a department.
Definitely need to teach more hand to hand type training, and be more timely in teaching this. They should teach Krav Maga, and use it along with basic hands on techniques.
It would be an easy way...