Adapt to 0.90.x API changes