Updates to match Mantle changes.