Fixed API changes that broke everything