Some fixes on node owner code.