Sunroof

Having had a couple of cold showers after it had been raining I decided my front sunroof was leaking. No surprise there!
After checking various threads I've stripped out the headlining and had a good look around. Doesn't look like it's been leaking for long as there is no damage fortunately. One of the plastic drain cups is loose and it also looks like one on the rear sunroof is leaking judging by a small, dark stain underneath it. I'll double check in the morning when Mrs McGraw can give me a hand chucking water on them to see if that's all it is.
So, two questions. If that's the only leak do I leave well alone or strip the rest out and seal back up?
What's the best long term method of sealing these plastic drain cups to the undertray? I've seen araldite and silicon sealer mentioned, how about using a hot glue gun?
Thanks

I removed mine completely and had them re-fabricated in steel, never had any problem since - don't know why Land Rover didn't do that in the first place !

If your getting water to the drain cups then u have a faulty glass seal so easy to replace.
The drains are placed at the front so they takeaway any water that's laying on the glass when the glass is tilted nothing else.
If you have water getting to the headlining then the sunroof frame to roof seal is faulty, which will require either the frame removing to replace with sealant or a bead of sealant around the frame externally that's the easy option

I have gone through all of the above,check the drain pipe has not got a screw squashing or through it stooping the water escaping(common fault from LR friday night assemble!)
The plastic conecters are rubbish you can get ali ones on ebay for a couple of quid.
The other thing I had was the metal frame around the sunroof sealent was rubbish (and still land rover kept using it for years) to solve this is a bit more labour intensive ;remove the whole roof clean off poor quality land over sealant and replace with something like tiger seal or windscreen silicon.You will be able to see if you look on top of you roof if the frame is wavey and rippled thus letting in water where you least expect it !
good luck
ps... If mine leaks again after spending many many many hours trying to fix it I have a sure fire quick fix .......... go to a vynil wrap car signage company and ask for a clear piece of vinyl to cover the sunroof with at least three inches over sized ensure corners are rounded as they wont peal then stick it over the roof never to openened again but at least it will not leak!!