Fixed incompatible API changes