more node fixes