I have a leaky fuel tap on my '87 XBR and cannot find a replacement for less than about £50. I am considering drilling out the rivet heads and replacing them with either self tapping screws or 2.5 mm bolts to get inside the tap and see whether I can do a repair. Does anyone know of a repair kit to fit this tap? Or has anyone out there done this before? Any ideas or information gratefully received.