Few adjustements for MADT code, still far from final.