EdgeStone fix and other fixes