diff --git a/cmdline/CtaAdminCmd.cpp b/cmdline/CtaAdminCmd.cpp
index e9dc07958260de8d6abd1164d3ae9c9e23f7bd9f..15a97003c4b6016b43c7790626581b95c4a09357 100644
--- a/cmdline/CtaAdminCmd.cpp
+++ b/cmdline/CtaAdminCmd.cpp
@@ -68,6 +68,7 @@ void IStreamBuffer<cta::xrd::Data>::DataCallback(cta::xrd::Data record) const
          default:
             throw std::runtime_error("Not implemented/received invalid stream data from CTA Frontend.");
       }
+      break;
 
       case Data::kAfSummaryItemFieldNumber : switch(record.af_summary_item().type())
       {
@@ -76,6 +77,7 @@ void IStreamBuffer<cta::xrd::Data>::DataCallback(cta::xrd::Data record) const
          default:
             throw std::runtime_error("Not implemented/received invalid stream data from CTA Frontend.");
       }
+      break;
 
       default:
          throw std::runtime_error("Received invalid stream data from CTA Frontend.");
diff --git a/cmdline/CtaAdminCmd.hpp b/cmdline/CtaAdminCmd.hpp
index e0935cfb98c372000096d9e67e94ef1f673bb23a..ee497b841fc5ba0fc1bea683d453e482dc5caba6 100644
--- a/cmdline/CtaAdminCmd.hpp
+++ b/cmdline/CtaAdminCmd.hpp
@@ -82,7 +82,7 @@ private:
    cta::xrd::Request m_request;                         //!< Protocol Buffer for the command and parameters
 
    static constexpr const char* const TEXT_RED    = "\x1b[31;1m";     //!< Terminal formatting code for red text
-   static constexpr const char* const TEXT_NORMAL = "\x1b[0m\n";      //!< Terminal formatting code for normal text
+   static constexpr const char* const TEXT_NORMAL = "\x1b[0m";        //!< Terminal formatting code for normal text
    static constexpr const char* const LOG_SUFFIX  = "CtaAdminCmd";    //!< Identifier for log messages
 };