fixed mgmt CLI issues