Minor fixes to access node attributes in a consistent manner