Make sure that you are able to find bolts which are a tight fit between the non-threaded portion of the bolt and the holes in the frame and the bracket. Any slack in the holes will lead to these holes to become larger over time.
The original rivets were installed under great pressure, resulting in a very tight fit. You will discover this when you try to pound them out even after drilling and grinding on them.
