Compilation fix and enabled BEH_API_ClientNodeSameId