Update MSM_Thermal properly (copying @faux123)
Same as before