Hotfixes on plugin, saving ok, nodes ok