CLI fixes (display issue + sync issue)