When removing rivets, don't be afraid to drill through the shank when you have one that doesn't want to punch out. If you are going to put a bolt in the hole, you will need to drill to the bolt size anyhow, rivet hole sizes are not the same as bolt sizes.