Updates to make compatible with the latest version of Terra.