Fix issues with node implementation.