Neighbors fixes