I'd suggest a rivet remover tool w/extra drill bits too.
For rivets with popped/corroded heads, those can be free drilled carefully, or from the backside, twist out the 'shop head' formed head with screw remover pliers, like Vampliers.