I recently tackled the rust surrounding my windshield and boy am I glad I did. After much grinding and painting the windshield and molding are in but I am having trouble with the three lower rivet holes on the drivers side moulding. They don't fit snug and keep popping out, but just those three holes. I am using Toyota oem rivets. My thought is the corrosion made the rivet hole just slightly too big. Any advice on what to do now? Should I look for a larger size rivet? Are there any other ideas to fasten and close the hole without using screws? Any advice is appreciated.