And some more node fixes