Fix issue with custom nodes, updated geometry message parsing logic.