Neighborhood fixes