Fixing node initialisation issues