Prime the rivets by dipping. This has two benefits, 1) corrosion resistance, 2) will hold the rivet from turning if it needs to be drilled out.
Using Dupont Variprime 615S Primer and 616S Converter (activator). Mix it up in small batches and it goes a long way using a brush and dipping the rivets.