Fix neighbor discovery

WIP