NodeController fixes