CLI params fixes