My 1990 90hp Force is running great after getting a lot of help from this site. One thing that I need to address is that the rivet/screw that holds the 'swivel clamp ' on the 'gear shift arm' is pulling through the gear shift arm. This causes a lot of play that makes shifting rough and now its causing the neutral safety switch to not be engaged properly. Any way to replace this rivet/screw? I know I can adjust the neutral safety switch but would rather fix the problem entirely. I also have a spare gear shift arm, but if there is a simpler fix I'd like to know. If I have to replace the whole arm, are there any tricks or pitfalls I should be aware of? Thanks!