diff --git a/cmdline/CtaAdminCmdParse.hpp b/cmdline/CtaAdminCmdParse.hpp
index 2231f863910a52ac1087d56e44e0125c1447b9b6..3d4d1a377989c2e06e943eb6e4330d4cf8517dcf 100644
--- a/cmdline/CtaAdminCmdParse.hpp
+++ b/cmdline/CtaAdminCmdParse.hpp
@@ -598,7 +598,7 @@ const std::map<cmd_key_t, cmd_val_t> cmdOptions = {
       { opt_tapepool_alias, opt_vo.optional(), opt_partialtapes.optional(), opt_encrypted.optional(),
         opt_supply.optional(), opt_comment.optional() }},
    {{ AdminCmd::CMD_TAPEPOOL,             AdminCmd::SUBCMD_RM    }, { opt_tapepool_alias }},
-   {{ AdminCmd::CMD_TAPEPOOL,             AdminCmd::SUBCMD_LS    }, { opt_tapepool.optional(), opt_vo.optional(), opt_encrypted.optional()}},
+   {{ AdminCmd::CMD_TAPEPOOL,             AdminCmd::SUBCMD_LS    }, { opt_tapepool_alias.optional(), opt_vo.optional(), opt_encrypted.optional()}},
    /*----------------------------------------------------------------------------------------------------*/
    {{ AdminCmd::CMD_DISKSYSTEM,           AdminCmd::SUBCMD_ADD   },
       { opt_disksystem, opt_file_regexp, opt_free_space_query_url, opt_refresh_interval, opt_targeted_free_space, opt_sleep_time,
diff --git a/cmdline/CtaAdminTextFormatter.cpp b/cmdline/CtaAdminTextFormatter.cpp
index 993e96bb14dcb6572b1146aafcf9db0c08ac595b..80ca2425d7e6f369ac37f8f17944229b8a7c1124 100644
--- a/cmdline/CtaAdminTextFormatter.cpp
+++ b/cmdline/CtaAdminTextFormatter.cpp
@@ -296,6 +296,7 @@ void TextFormatter::print(const DriveLsItem &drls_item)
 void TextFormatter::printFailedRequestLsHeader() {
   push_back("HEADER");
   push_back(
+    "object id",
     "request type",
     "copy no",
     "tapepool/vid",
@@ -323,6 +324,7 @@ void TextFormatter::print(const FailedRequestLsItem &frls_item) {
   }
 
   push_back(
+    frls_item.object_id(),
     request_type,
     frls_item.copy_nb(),
     tapepool_vid,
@@ -678,7 +680,7 @@ void TextFormatter::printShowQueuesHeader() {
     "type",
     "tapepool",
     "vo",
-    "logical library",
+    "library",
     "vid",
     "files queued",
     "data queued",
diff --git a/tapeserver/castor/tape/tapeserver/daemon/TapeWriteSingleThread.cpp b/tapeserver/castor/tape/tapeserver/daemon/TapeWriteSingleThread.cpp
index 8b90bedc75890185906e764caede29ca5548507d..c3e8cd5c9489dfae699a04bcd7f16d783eceb2bc 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/TapeWriteSingleThread.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/TapeWriteSingleThread.cpp
@@ -82,7 +82,7 @@ castor::tape::tapeserver::daemon::TapeWriteSingleThread::TapeCleaning::~TapeClea
       m_this.m_drive.waitUntilReady(waitMediaInDriveTimeout);
     } catch (cta::exception::TimeOut &) {}
     if (!m_this.m_drive.hasTapeInPlace()) {
-      m_this.m_logContext.log(cta::log::INFO, "TapeReadSingleThread: No tape to unload");
+      m_this.m_logContext.log(cta::log::INFO, "TapeWriteSingleThread: No tape to unload");
       goto done;
     }
     // in the special case of a "manual" mode tape, we should skip the unload too.
diff --git a/xroot_plugins/XrdCtaTapePoolLs.hpp b/xroot_plugins/XrdCtaTapePoolLs.hpp
index ed8f57715a233c249dc62bb17ea40403997585fe..241fd373f0e711048bd5f0a679f74fb5021d7391 100644
--- a/xroot_plugins/XrdCtaTapePoolLs.hpp
+++ b/xroot_plugins/XrdCtaTapePoolLs.hpp
@@ -66,9 +66,9 @@ TapePoolLsStream::TapePoolLsStream(const RequestMessage &requestMsg, cta::catalo
   XrdSsiPb::Log::Msg(XrdSsiPb::Log::DEBUG, LOG_SUFFIX, "TapePoolLsStream() constructor");
   cta::catalogue::TapePoolSearchCriteria searchCriteria;
 
-  searchCriteria.name = requestMsg.getOptional(OptionString_Key_TAPE_POOL);
-  searchCriteria.vo = requestMsg.getOptional(OptionString_Key_VO);
-  searchCriteria.encrypted = requestMsg.getOptional(OptionBoolean_Key_ENCRYPTED);
+  searchCriteria.name = requestMsg.getOptional(OptionString::TAPE_POOL);
+  searchCriteria.vo = requestMsg.getOptional(OptionString::VO);
+  searchCriteria.encrypted = requestMsg.getOptional(OptionBoolean::ENCRYPTED);
 
   m_tapePoolList = m_catalogue.getTapePools(searchCriteria);
 }