diff --git a/cmake/CPackOptions.cmake.in b/cmake/CPackOptions.cmake.in
index 4858f338..6d4fd97f 100644
--- a/cmake/CPackOptions.cmake.in
+++ b/cmake/CPackOptions.cmake.in
@@ -30,7 +30,7 @@ if (${CPACK_GENERATOR} STREQUAL "RPM")
   set (CPACK_RPM_FILE_NAME "RPM-DEFAULT")
   set (CPACK_RPM_PACKAGE_RELEASE "1")
   # next variable for RHEL, CentOS, Fedora
-  set (CPACK_RPM_PACKAGE_RELEASE_DIST "")
+  set (CPACK_RPM_PACKAGE_RELEASE_DIST "el8")
   set (CPACK_RPM_PACKAGE_LICENSE "GPLv2")
   set (CPACK_RPM_PACKAGE_VENDOR "Paul Scherrer Institute - LMU - LEM")
   set (CPACK_RPM_CHANGELOG_FILE "@PROJECT_SOURCE_DIR@/cmake/ChangeLogRPM")
diff --git a/doc/examples/UserFcn/PUserFcn.cpp b/doc/examples/UserFcn/PUserFcn.cpp
index ed9a7894..b32b28cc 100644
--- a/doc/examples/UserFcn/PUserFcn.cpp
+++ b/doc/examples/UserFcn/PUserFcn.cpp
@@ -8,7 +8,7 @@
 ***************************************************************************/
 
 /***************************************************************************
- *   Copyright (C) 2007-2021 by Andreas Suter                              *
+ *   Copyright (C) 2007-2023 by Andreas Suter                              *
  *   andreas.suter@psi.ch                                                  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
diff --git a/src/classes/PMsrHandler.cpp b/src/classes/PMsrHandler.cpp
index 4869cda4..2aad5f05 100644
--- a/src/classes/PMsrHandler.cpp
+++ b/src/classes/PMsrHandler.cpp
@@ -6171,7 +6171,7 @@ Bool_t PMsrHandler::CheckMaps()
           if (FilterNumber(str, "map", MSR_PARAM_MAP_OFFSET, no)) {
             mapVec.push_back(no);
             mapBlock.push_back(1); // 1 = theory-block
-            mapLineNo.push_back(fTheory[i].fLineNo);
+            mapLineNo.push_back(fFunctions[i].fLineNo);
           }
         }
       }
diff --git a/src/external/libFitPofB/classes/TPofTCalc.cpp b/src/external/libFitPofB/classes/TPofTCalc.cpp
index 12a1eb05..12684e84 100644
--- a/src/external/libFitPofB/classes/TPofTCalc.cpp
+++ b/src/external/libFitPofB/classes/TPofTCalc.cpp
@@ -13,7 +13,7 @@
 ***************************************************************************/
 
 /***************************************************************************
- *   Copyright (C) 2008-2014 by Bastian M. Wojek, Andreas Suter            *
+ *   Copyright (C) 2008-2023 by Bastian M. Wojek, Andreas Suter            *
  *                                                                         *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
diff --git a/src/musredit_qt5/mupp/PmuppAdmin.cpp b/src/musredit_qt5/mupp/PmuppAdmin.cpp
index f9a44a4f..a41e5194 100644
--- a/src/musredit_qt5/mupp/PmuppAdmin.cpp
+++ b/src/musredit_qt5/mupp/PmuppAdmin.cpp
@@ -8,7 +8,7 @@
 *****************************************************************************/
 
 /***************************************************************************
- *   Copyright (C) 2010-2017 by Andreas Suter                              *
+ *   Copyright (C) 2010-2023 by Andreas Suter                              *
  *   andreas.suter@psi.ch                                                  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
diff --git a/src/musredit_qt5/musrWiz/PAdmin.cpp b/src/musredit_qt5/musrWiz/PAdmin.cpp
index af7001f4..f145db6c 100644
--- a/src/musredit_qt5/musrWiz/PAdmin.cpp
+++ b/src/musredit_qt5/musrWiz/PAdmin.cpp
@@ -8,7 +8,7 @@
 *****************************************************************************/
 
 /***************************************************************************
- *   Copyright (C) 2010-2016 by Andreas Suter                              *
+ *   Copyright (C) 2010-2023 by Andreas Suter                              *
  *   andreas.suter@psi.ch                                                  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
diff --git a/src/musredit_qt6/mupp/PmuppAdmin.cpp b/src/musredit_qt6/mupp/PmuppAdmin.cpp
index 76dcbdfb..896dc27b 100644
--- a/src/musredit_qt6/mupp/PmuppAdmin.cpp
+++ b/src/musredit_qt6/mupp/PmuppAdmin.cpp
@@ -8,7 +8,7 @@
 *****************************************************************************/
 
 /***************************************************************************
- *   Copyright (C) 2010-2017 by Andreas Suter                              *
+ *   Copyright (C) 2010-2023 by Andreas Suter                              *
  *   andreas.suter@psi.ch                                                  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *