My solution to sunroof leak was to first clean glass and outer gasket. Snug up T-20 bolts of sunroof arms and glass. Removed headliner around the sunroof only and tightened the T-15 sunroof frame bolts. You will need a small flashlight that can be supported between the headliner and roof, and use a 1/4" racket with stubby sockets, or use a small screwdriver racket. The regular socket will be too tall.
This was done after blowing air in the drain holes and checking for leaks, which there were none.
This was done after blowing air in the drain holes and checking for leaks, which there were none.