more fixes on CLI failures