I tend to source fitted bolts with new barrels, and pinned gas blocks...