Iregular neutral light and high beam light

[DanTheMan]

Hey there,
I have been met with an issue on my 06 Baby Varadero.
The neutral and high beam lights are blinking seemingly randomly, it usually lights up fine after i add gas (Vibrations?). Mostly experienced this with the neutral light.
The signal from the neutral switch must be getting fine to the computer, since i had no problems with starting even with the clutch released and the neutral light off. (and yes it indeed was in neutral.)
I took apart the instrument cluster, only note worthy thing is that the contacts between the PCB and the light holders seemed scraped.
Any ideas what to check next or how should i proceed about the scraped contacts?
Happy riding,
-Dan