Still errors before CLI refactoring