Accommodate justitia API changes