diff --git a/cmake/Modules/FindPhotos++.cmake b/cmake/Modules/FindPhotos++.cmake
index 3cb454a..b8876ce 100644
--- a/cmake/Modules/FindPhotos++.cmake
+++ b/cmake/Modules/FindPhotos++.cmake
@@ -1,50 +1,50 @@
 # - Try to find Photos++
 # Defines:
 #
 #  PHOTOS++_FOUND
 #  PHOTOS++_INCLUDE_DIR
 #  PHOTOS++_INCLUDE_DIRS (not cached)
 #  PHOTOS++_<component>_LIBRARY
 #  PHOTOS++_<component>_FOUND
 #  PHOTOS++_LIBRARIES (not cached)
 #  PHOTOS++_LIBRARY_DIRS (not cached)
 
 # Enforce a minimal list if none is explicitly requested
 if(NOT PHOTOS++_FIND_COMPONENTS)
-  set(PHOTOS++_FIND_COMPONENTS pp ppHepMC)
+  set(PHOTOS++_FIND_COMPONENTS pp ppHepMC ppHepMC3)
 endif()
 
 foreach(component ${PHOTOS++_FIND_COMPONENTS})
   find_library(PHOTOS++_${component}_LIBRARY NAMES Photos${component}
-               HINTS ${PHOTOS++_ROOT_DIR}/lib
-                     $ENV{PHOTOSPP_ROOT_DIR}/lib
-                     ${PHOTOSPP_ROOT_DIR}/lib)
+               HINTS ${PHOTOS++_ROOT_DIR}/lib $ENV{PHOTOSPP_ROOT_DIR}/lib ${PHOTOSPP_ROOT_DIR}/lib
+                     ${PHOTOS++_ROOT_DIR}/lib64 $ENV{PHOTOSPP_ROOT_DIR}/lib64 ${PHOTOSPP_ROOT_DIR}/lib64
+               )
   if (PHOTOS++_${component}_LIBRARY)
     set(PHOTOS++_${component}_FOUND 1)
     list(APPEND PHOTOS++_LIBRARIES ${PHOTOS++_${component}_LIBRARY})
 
     get_filename_component(libdir ${PHOTOS++_${component}_LIBRARY} PATH)
     list(APPEND PHOTOS++_LIBRARY_DIRS ${libdir})
   else()
     set(PHOTOS++_${component}_FOUND 0)
   endif()
   mark_as_advanced(PHOTOS++_${component}_LIBRARY)
 endforeach()
 
 if(PHOTOS++_LIBRARY_DIRS)
   list(REMOVE_DUPLICATES PHOTOS++_LIBRARY_DIRS)
 endif()
 
 find_path(PHOTOS++_INCLUDE_DIR Photos/Photos.h
           HINTS ${PHOTOS++_ROOT_DIR}/include
                 $ENV{PHOTOSPP_ROOT_DIR}/include
                 ${PHOTOSPP_ROOT_DIR}/include)
 set(PHOTOS++_INCLUDE_DIRS ${PHOTOS++_INCLUDE_DIR})
 mark_as_advanced(PHOTOS++_INCLUDE_DIR)
 
 # handle the QUIETLY and REQUIRED arguments and set PHOTOS++_FOUND to TRUE if
 # all listed variables are TRUE
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Photos++ DEFAULT_MSG PHOTOS++_INCLUDE_DIR PHOTOS++_LIBRARIES)
 
 mark_as_advanced(PHOTOS++_FOUND)
diff --git a/cmake/Modules/FindTauola++.cmake b/cmake/Modules/FindTauola++.cmake
index c2a7644..cdd4eb1 100644
--- a/cmake/Modules/FindTauola++.cmake
+++ b/cmake/Modules/FindTauola++.cmake
@@ -1,53 +1,49 @@
 # - Try to find Tauola++
 # Defines:
 #
 #  TAUOLA++_FOUND
 #  TAUOLA++_INCLUDE_DIR
 #  TAUOLA++_INCLUDE_DIRS (not cached)
 #  TAUOLA++_<component>_LIBRARY
 #  TAUOLA++_<component>_FOUND
 #  TAUOLA++_LIBRARIES (not cached)
 #  TAUOLA++_LIBRARY_DIRS (not cached)
 
 # Enforce a minimal list if none is explicitly requested
-if(NOT Tauola++_FIND_COMPONENTS)
-  set(Tauola++_FIND_COMPONENTS Fortran CxxInterface)
+if(NOT TAUOLA++_FIND_COMPONENTS)
+  set(TAUOLA++_FIND_COMPONENTS Fortran CxxInterface HepMC HepMC3)
 endif()
 
-#message(STATUS "Tauola++ CMAKE_PREFIX_PATH")
-#foreach(_x ${CMAKE_PREFIX_PATH})
-#  message(STATUS "Tauola++ -- ${_x}")
-#endforeach()
-
-foreach(component ${Tauola++_FIND_COMPONENTS})
+foreach(component ${TAUOLA++_FIND_COMPONENTS})
   find_library(TAUOLA++_${component}_LIBRARY NAMES Tauola${component}
-               HINTS ${TAUOLA++_ROOT_DIR}/lib
-                     $ENV{TAUOLAPP_ROOT_DIR}/lib ${TAUOLAPP_ROOT_DIR}/lib)
+               HINTS ${TAUOLA++_ROOT_DIR}/lib $ENV{TAUOLAPP_ROOT_DIR}/lib ${TAUOLAPP_ROOT_DIR}/lib
+                     ${TAUOLA++_ROOT_DIR}/lib64 $ENV{TAUOLAPP_ROOT_DIR}/lib64 ${TAUOLAPP_ROOT_DIR}/lib64
+                      )
   if (TAUOLA++_${component}_LIBRARY)
     set(TAUOLA++_${component}_FOUND 1)
     list(APPEND TAUOLA++_LIBRARIES ${TAUOLA++_${component}_LIBRARY})
 
     get_filename_component(libdir ${TAUOLA++_${component}_LIBRARY} PATH)
     list(APPEND TAUOLA++_LIBRARY_DIRS ${libdir})
   else()
     set(TAUOLA++_${component}_FOUND 0)
   endif()
   mark_as_advanced(TAUOLA++_${component}_LIBRARY)
 endforeach()
 
 if(TAUOLA++_LIBRARY_DIRS)
   list(REMOVE_DUPLICATES TAUOLA++_LIBRARY_DIRS)
 endif()
 
 find_path(TAUOLA++_INCLUDE_DIR Tauola/Tauola.h
           HINTS ${TAUOLA++_ROOT_DIR}/include
                 $ENV{TAUOLAPP_ROOT_DIR}/include ${TAUOLAPP_ROOT_DIR}/include)
 set(TAUOLA++_INCLUDE_DIRS ${TAUOLA++_INCLUDE_DIR})
 mark_as_advanced(TAUOLA++_INCLUDE_DIR)
 
 # handle the QUIETLY and REQUIRED arguments and set TAUOLA++_FOUND to TRUE if
 # all listed variables are TRUE
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Tauola++ DEFAULT_MSG TAUOLA++_INCLUDE_DIR TAUOLA++_LIBRARIES)
 
 mark_as_advanced(TAUOLA++_FOUND)