the vendors used to have a special kit to replace the rivets with screws and nuts, instead of a "head", the screws had a small flat plate, don't know if you could find those, but works fine
"When we tug a single thing in nature, we find it attached to the rest of the world" ~ John Muir "When we tug a single thing on an old truck, we find it falls off" ~ me Some TF series details & TF heater pics