Yeah, the upper hg pin is not my favorite part of the set and the whole thing did take a lot of tweaking. It took several sessions of shaving the inner part that mates with the sight block, then shooting it, shaving a little more, shooting it, etc... It's all still pretty tight but I can pop the pin, pull it back and then pry the hg off using just my fingers, which was the goal. For the pin itself, I did polish it real well and even polished the BB as well as I could.