Both of those things would help substantially, but it's not the entire problem. One of the core problems is that police have essentially been militarized. Their purpose isn't to serve the public trust, it's to engage in the control of an occupied population. Their purpose to ensure the most likely segment of the populace to take to the streets doesn't.
That's why all this crying over law and order in response to the protests is kind of hilarious. Their heavy handed tactics have backfired hard, and I have no sympathy for any of them. I feel for the police the same way I'd feel for an occupying army facing resistance.