Fixes for latest smaller/node/config updates