Bike's been standing in garage for 2 years and wanted to get it MOT'd for sale. Don't use it at all as have a new toy. 2 problems on MOT

1. Fitted new back brake switch but the front indicator lights stay on. Any thoughts?

2. Main beam switch sticks sometimes. Tried WD40, which worked for 10 minutes!

Bike is 1996 CBR400RR NC29. Suggestions greatly appreciated

Shahid