Two questions about heater restoration (for my 61):

Heater Core- Unless this is leaking...should I just assume this is ok? Should I have any concerns with this at all?

The black painted metal doors and trap door inside...mine have quite a bit of rust and clearly it would be best to remove them to blast and paint them. However, I still can't seem to find the replacement rivets. Anyone know where to find those?