diff --git a/cmd/reva/common.go b/cmd/reva/common.go
index 0e568d1212..bdcef51bf0 100644
--- a/cmd/reva/common.go
+++ b/cmd/reva/common.go
@@ -96,7 +96,7 @@ func writeToken(token string) {
 }
 
 func read(r *bufio.Reader) (string, error) {
-	text, err := r.ReadString('\n')
+	text, err := r.ReadString('\r')
 	if err != nil {
 		return "", err
 	}
diff --git a/pkg/eosclient/eosbinary/eosbinary.go b/pkg/eosclient/eosbinary/eosbinary.go
index 10189b7daf..a9de8738ca 100644
--- a/pkg/eosclient/eosbinary/eosbinary.go
+++ b/pkg/eosclient/eosbinary/eosbinary.go
@@ -692,7 +692,7 @@ func (c *Client) Rename(ctx context.Context, auth eosclient.Authorization, oldPa
 
 // List the contents of the directory given by path.
 func (c *Client) List(ctx context.Context, auth eosclient.Authorization, path string) ([]*eosclient.FileInfo, error) {
-	args := []string{"oldfind", "--fileinfo", "--maxdepth", "1", path}
+	args := []string{"find", "--fileinfo", "--skip-version-dirs", "--maxdepth", "1", path}
 	stdout, _, err := c.executeEOS(ctx, args, auth)
 	if err != nil {
 		return nil, errors.Wrapf(err, "eosclient: error listing fn=%s", path)