I used stainless bolts with some 3m sealer between them and the top.
What length rivets did you use on the roof cap cross strip that sits right behind the inside of the windshield frame?