Hi Graham, The sunroof issue shuould still be covered under warranty. the biggest mistake i made was by an XF with a sunroof.... My sunroof has been in 7 times now throughout the year. If your dealer have been aware of this or has a log of it before the warranty ran out then this should be looked at, or the extended should look after it. The XF suffers from rattling clip that have had a re modification for. ask your dealer to fit these, and make sure they dont cover your headlining with silicon spray, its a bugger to get out. Check the rubber external seals, these perish and causes the roof to move when the chassis is under strain. and lastly, im not sure how old your car is, howver there was a re call/Mod to have some tig welds added under by the parcel shelf, this stiffens things up a bit limits the creaking noises.