gluon-next-node: some minor fixes