Definitely replace the buffer. Replace the internals? When I bought mine, everyone here said replace the internals. Mine was NIB. I called someone, it might have been Wheatley -- I forget -- and asked what parts I should replace. He said go shoot the thing and when something breaks, replace it...