API changes; fix