Align with latest ncclient