Really cheap hack for the rivets is.. I use a grade 8 bolt from the hardware store--I keep a 5/16, 3/8,7/16 and 1/2 bolt handy. They have a cupped end on the thread end of the bolt that is pretty close to the curve on those domed rivets. Unfortunately it does not work for double capped (rivets with dome caps on both ends)