I've got a BSA No5 Mk1 that I am trying to "un-Bubba." Three issues that I'm having trouble solving: 1. At some point in it's life, Bubba cut back the flash hider to just ahead of the barrel and removed the bayonet lug. Unfortunately, No5 Mk1 flash hiders are as scarce as elephants in the Arctic. I've tried a "new" manufacture from Apex, with poor results, and returned it. Can anyone recommend a source for these? Anywhere. Failing this, maybe I'll just leave it. 2. I've been able to restore all but the rear sight pins that hold the flip up vertical. Replaced the horizontal pin that holds on the rear sight, but need advice on the additional parts that hold that pin on and those that hold it vertical when flipped up. Any advice on those is also appreciated. 3. Bubba drilled three holds in the left side of the receiver to mount a sight base. The holes obscure the original "No5 Mk1" BSA electro pencil by about 50%. I, originally, considered having them welded up, but I'm concerned that will destroy what's left of the original engraving. Is there any harm in leaving them? At this point, I'm trying to turn it back into as much as a mil-surp shooter as I am able....all advice appreciated. Trying to bring back 2016 to 1945...absolutely a difficult travel in time. But, I'm determined. Otherwise, this rifle is in almost perfect condition.