Fix card cli issues