cli/core fixes