Penalties for rioting need to be upped and National Guard units need training in anti-riot tactics, he said.