Minor changes to Edge and NeighborController