Small changes so that TestMakeEsets passes.