Minor changes to get NeighborController to start at the right time