Few bug fixes with Edge class.