If the shims are dished or torn then replace them. New ones are a doddle to fit, old dished ones on the other hand aren't fun.

Tighten the breech bolt as far as you dare, the old 'tighten till the barrel falls under its own weight' is a good guide, then add another quarter turn for good measure.