I must have been fortunate to avoid any corroded fasteners when I did my unit, but stacking up the coolant tank etc definitely saved me a lot of time and hassle.

Hope your repair goes well!

__________________
2013 X5 xDrive3.5i Premium
2002 530I Sport Package
2001 X5 4.4i
2001 M3