Minor fixes to NodeController