diff --git a/Core/include/ACTS/Surfaces/BoundaryCheck.hpp b/Core/include/ACTS/Surfaces/BoundaryCheck.hpp
index e61a137d17e66d1d4783e054d514c1a18a65ca6a..a9d45436dc71ce059fefa3798690ef2dab30d4f3 100644
--- a/Core/include/ACTS/Surfaces/BoundaryCheck.hpp
+++ b/Core/include/ACTS/Surfaces/BoundaryCheck.hpp
@@ -1,6 +1,6 @@
 // This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016 ACTS project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/ACTS/Surfaces/DiscTrapezoidalBounds.hpp b/Core/include/ACTS/Surfaces/DiscTrapezoidalBounds.hpp
index ab6434aaccc5490b47751e49ebf72ccbf9fac3a8..cd51a3bb315f4b758252e5a4f79f2542ec201b31 100644
--- a/Core/include/ACTS/Surfaces/DiscTrapezoidalBounds.hpp
+++ b/Core/include/ACTS/Surfaces/DiscTrapezoidalBounds.hpp
@@ -1,6 +1,6 @@
 // This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016 ACTS project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/ACTS/Surfaces/EllipseBounds.hpp b/Core/include/ACTS/Surfaces/EllipseBounds.hpp
index 33c985b6b686ad93d3ffd6f94c5be396ed7d3621..66c430dee04298985cc36577cc1e6cac2b546f24 100644
--- a/Core/include/ACTS/Surfaces/EllipseBounds.hpp
+++ b/Core/include/ACTS/Surfaces/EllipseBounds.hpp
@@ -1,6 +1,6 @@
 // This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016 ACTS project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/ACTS/Surfaces/InfiniteBounds.hpp b/Core/include/ACTS/Surfaces/InfiniteBounds.hpp
index e4013a6e2d28a6de8f8dc2e8184dac6561dc2f0a..2d6b0ca6f7cb46c257e312106eacd0f178e4512b 100644
--- a/Core/include/ACTS/Surfaces/InfiniteBounds.hpp
+++ b/Core/include/ACTS/Surfaces/InfiniteBounds.hpp
@@ -1,6 +1,6 @@
 // This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016 ACTS project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/ACTS/Surfaces/LineBounds.hpp b/Core/include/ACTS/Surfaces/LineBounds.hpp
index b6fbe6b502dad7bd522f36ee033afda7e90ccd59..3a8f0ea785b7f9d1ca1ae8ed8cbe3d5d088dd38c 100644
--- a/Core/include/ACTS/Surfaces/LineBounds.hpp
+++ b/Core/include/ACTS/Surfaces/LineBounds.hpp
@@ -1,6 +1,6 @@
 // This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016 ACTS project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/ACTS/Surfaces/PlanarBounds.hpp b/Core/include/ACTS/Surfaces/PlanarBounds.hpp
index 3db6616d4f171fc542a7f870b92976de6bc3acc6..e33c75842fbcfe0a13b15576b702236294e1329d 100644
--- a/Core/include/ACTS/Surfaces/PlanarBounds.hpp
+++ b/Core/include/ACTS/Surfaces/PlanarBounds.hpp
@@ -1,6 +1,6 @@
 // This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016 ACTS project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/ACTS/Surfaces/RadialBounds.hpp b/Core/include/ACTS/Surfaces/RadialBounds.hpp
index 6f68436e3db3bbaae35805ea2c981d5e52b0b729..55eb7bd2795784744f06b16d56464185f87c4632 100644
--- a/Core/include/ACTS/Surfaces/RadialBounds.hpp
+++ b/Core/include/ACTS/Surfaces/RadialBounds.hpp
@@ -1,6 +1,6 @@
 // This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016 ACTS project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/ACTS/Surfaces/RectangleBounds.hpp b/Core/include/ACTS/Surfaces/RectangleBounds.hpp
index c595532f1ce2fa057b71dcf722cfbc87e922e964..66009031b6d2d8f46ce55149936cb34aa9b5e7aa 100644
--- a/Core/include/ACTS/Surfaces/RectangleBounds.hpp
+++ b/Core/include/ACTS/Surfaces/RectangleBounds.hpp
@@ -1,6 +1,6 @@
 // This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016 ACTS project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/ACTS/Surfaces/SurfaceBounds.hpp b/Core/include/ACTS/Surfaces/SurfaceBounds.hpp
index fbd1d63bf97f01188d27ed031e5dde9cbeda78ce..5d4c70c7226b6d6272ae200a3f1157ed44d07a57 100644
--- a/Core/include/ACTS/Surfaces/SurfaceBounds.hpp
+++ b/Core/include/ACTS/Surfaces/SurfaceBounds.hpp
@@ -1,6 +1,6 @@
 // This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016 ACTS project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/ACTS/Surfaces/TrapezoidBounds.hpp b/Core/include/ACTS/Surfaces/TrapezoidBounds.hpp
index 386d6973617628219159ff868d01d7c811270b7b..70b7da1dd088b74550ebec37d230389db89037a0 100644
--- a/Core/include/ACTS/Surfaces/TrapezoidBounds.hpp
+++ b/Core/include/ACTS/Surfaces/TrapezoidBounds.hpp
@@ -1,6 +1,6 @@
 // This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016 ACTS project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/ACTS/Surfaces/TriangleBounds.hpp b/Core/include/ACTS/Surfaces/TriangleBounds.hpp
index 7f56eefd7352e0d98ed5778581bd7dc552d140ee..b6c8e63e15a29fe2baa3a6ee2e0211b1b9c64841 100644
--- a/Core/include/ACTS/Surfaces/TriangleBounds.hpp
+++ b/Core/include/ACTS/Surfaces/TriangleBounds.hpp
@@ -1,6 +1,6 @@
 // This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016 ACTS project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/ACTS/Utilities/detail/RealQuadraticEquation.hpp b/Core/include/ACTS/Utilities/detail/RealQuadraticEquation.hpp
index de29debffba3b7ce59f1807f94893cfbeb7b0c26..96e367c9d776c77a121f9f6105b29cb964075e12 100644
--- a/Core/include/ACTS/Utilities/detail/RealQuadraticEquation.hpp
+++ b/Core/include/ACTS/Utilities/detail/RealQuadraticEquation.hpp
@@ -1,6 +1,6 @@
 // This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016 ACTS project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/src/Surfaces/LineBounds.cpp b/Core/src/Surfaces/LineBounds.cpp
index d34fca1bd03f826a93f698673af02494aaa6a2fa..9a68bf8c6c7c43e00db36cbf7ae290b4e4548678 100644
--- a/Core/src/Surfaces/LineBounds.cpp
+++ b/Core/src/Surfaces/LineBounds.cpp
@@ -1,6 +1,6 @@
 // This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016 ACTS project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/src/Surfaces/RadialBounds.cpp b/Core/src/Surfaces/RadialBounds.cpp
index 9387c412d69b5bca04813588882a3661fdec6308..72a572cb0f4cbdcfb241576822998d215c073e21 100644
--- a/Core/src/Surfaces/RadialBounds.cpp
+++ b/Core/src/Surfaces/RadialBounds.cpp
@@ -1,6 +1,6 @@
 // This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016 ACTS project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/src/Surfaces/RectangleBounds.cpp b/Core/src/Surfaces/RectangleBounds.cpp
index 3536e1100ac169a62835a970705bebad91114333..f1d486a2f786bcc01523e8754257c374c40368f4 100644
--- a/Core/src/Surfaces/RectangleBounds.cpp
+++ b/Core/src/Surfaces/RectangleBounds.cpp
@@ -1,6 +1,6 @@
 // This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016 ACTS project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/src/Surfaces/TrapezoidBounds.cpp b/Core/src/Surfaces/TrapezoidBounds.cpp
index df37e3a26a4801d79cfd3e827790d3c1b5e66523..421e9ebcde64d2def590827348f1bd3e6aac97a6 100644
--- a/Core/src/Surfaces/TrapezoidBounds.cpp
+++ b/Core/src/Surfaces/TrapezoidBounds.cpp
@@ -1,6 +1,6 @@
 // This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016 ACTS project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/src/Surfaces/TriangleBounds.cpp b/Core/src/Surfaces/TriangleBounds.cpp
index 1ca061c38a2997fca1abedb36c46e445ef1028c7..cb9745b174c12d395a9f87b33ff5e1d4620a8b8c 100644
--- a/Core/src/Surfaces/TriangleBounds.cpp
+++ b/Core/src/Surfaces/TriangleBounds.cpp
@@ -1,6 +1,6 @@
 // This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2017 ACTS project team
+// Copyright (C) 2016 ACTS project team
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Plugins/TGeoPlugins/CMakeLists.txt b/Plugins/TGeoPlugins/CMakeLists.txt
index baf0b3dba32d4d51cdbec5be6f777b7f2cc4bc02..e844eeb4afb9312cad37c3f7a3d7d8edf54a6e37 100644
--- a/Plugins/TGeoPlugins/CMakeLists.txt
+++ b/Plugins/TGeoPlugins/CMakeLists.txt
@@ -18,7 +18,7 @@ if (BUILD_TGEO_PLUGIN)
 
     # setup linker dependencies
     target_link_libraries (ACTSTGeoPlugin PUBLIC ACTSCore)
-    target_link_libraries (ACTSTGeoPlugin PUBLIC ROOT::Geom)
+    target_link_libraries (ACTSTGeoPlugin PUBLIC Geom)
 
     # set installation directories
     install (TARGETS ACTSTGeoPlugin EXPORT ACTSTGeoPluginTargets