Mostly working, to fix generation of node client indicators