Fix state neighbors integration