Fixes to per-node-type scripts infrastructure