Node class minor changes