Getting things working on SmartOS again

plus a few tweaks to make explicit clustering go more smoothly (because auto-clustering is kinda janky and busted).