Node Tools: Misc. minor improvements #104618

Merged

2 Commits