Fixed Node ID bug and bug with plugin only wokring with CW 2.0