Code

Fix four minor node tool regressions: