Fixes for when node attributes are missing