Bug fixes

Fixes in master update function.
node_Viewer name change fix.