Fixing API changes...