Fixed outstanding neighbour issues