Node related issues fixed