Fixes in node attribute saving