Changes for dynamix compatibility.