Make cli work slightly better