More to make tests pass on Circle