adjust to latest cli changes