Follow-ups to 2.0 API changes