Chatango node identification fixes