Minor changes related to non contiguous node IDs