Fix some mandella API changes