Solve compile errors in new cli implementation