Update Manager and Node to fix some bugs