Minor fixes on nodes sharing implementation