I re-drilled the #40 holes sizing them to #27 for a #6 screw in the HS and VS. Next I used a nut plate to locate the attaching rivet holes. Once done, all the holes were chamfered for a #6 screw. I installed the nut plates in the forward most section that secure the front of the HS/VS fairing. Next I will disassemble and add nut plates to the rest of the locations.