Interested in this thread as I have the non pano sunroof. Which I prefer. Mine was known broken when I bought it. After a recent rain I noticed water leaking onto the passenger side floor from the a pillar. Dried it out and sealed it with PPF for now which is working great. Leak stopped. My question is if there is a repair DYI or kit for the non pano roof. All searched I find address the pano roof.