Node fixes