Gauge cluster questions

[FarmerDale]

I have my gauge cluster('87 with clock) apart so I can brighten it up with a good cleaning and a little chrome paint for the backlight. 2 things grabbed my attention:
1. A few of the rivets holding the gauges to the dial face have some surface rust. What is my best approach to eliminate this? Was thinking a dab of paint over sanded metal (awful tight quarters with the dial face) or making it bright then wax the whole dial.
2. The printed circuit is not uniformly attached to the cluster. Do I completely remove it before painting the cluster or leave it and tack the loose areas down later? And with what adhesive?
Thanks for your help - Dale