Adjustments for cli executions