Those are all good fixes. I've already set back the barrel (and recut the slot), ground down the bolt face to 41 thousandths. Each was an improvement.

Up hills slow,
Down hills fast
Tonnage first and
Safety last.