I had a leak in the sunroof last year. All I did to fix it was silicone where the glass and the metal frame meet. Solved it right away.