Update to match recent chai updates