Fixing some basic API changes