Working on several minor bugs related to the nodes classes