Minor tweaks to fix current node indication