Fix API changes