diff --git a/a/arpack-ng/arpack-ng-3.5.0-intel-2020a.eb b/a/arpack-ng/arpack-ng-3.5.0-intel-2020a.eb
index b48b372f..ddcfedf8 100644
--- a/a/arpack-ng/arpack-ng-3.5.0-intel-2020a.eb
+++ b/a/arpack-ng/arpack-ng-3.5.0-intel-2020a.eb
@@ -15,7 +15,7 @@ source_urls = ['https://github.com/opencollab/arpack-ng/archive/']
 sources = ['%(version)s.tar.gz']
 checksums = ['50f7a3e3aec2e08e732a487919262238f8504c3ef927246ec3495617dde81239']
 
-builddependencies = [('Autotools', '20180311', '', True)]
+builddependencies = [('Autotools', '20180311')]
 
 preconfigopts = "sh bootstrap && "
 configopts = '--enable-mpi --with-pic --with-blas="$LIBBLAS" --with-lapack="$LIBLAPACK"'
diff --git a/c/CGAL/CGAL-4.11.1-intel-2020a.eb b/c/CGAL/CGAL-4.11.1-intel-2020a.eb
deleted file mode 100644
index 50e0a65b..00000000
--- a/c/CGAL/CGAL-4.11.1-intel-2020a.eb
+++ /dev/null
@@ -1,38 +0,0 @@
-# IT4Innovations 2020
-# LK
-
-name = 'CGAL'
-version = '4.11.1'
-
-homepage = 'http://www.cgal.org/'
-description = """The goal of the CGAL Open Source Project is to provide easy access to efficient
- and reliable geometric algorithms in the form of a C++ library."""
-
-toolchain = {'name': 'intel', 'version': '2020a'}
-toolchainopts = {'strict': True}
-
-source_urls = ['https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-%(version)s']
-sources = [SOURCE_TAR_XZ]
-
-dependencies = [
-    ('zlib', '1.2.11', '', True),
-    ('Boost', '1.72.0', '-Py-3.7'),
-    ('MPFR', '4.0.1', '' , True),
-    ('GMP', '6.1.2', '', True),
-    ('Mesa', '19.2.1', '', ('GCCcore', '8.3.0')),
-    ('libGLU', '9.0.1', '-Mesa-19.2.1', ('GCCcore', '8.3.0')),
-    ('Qt5', '5.13.1', '', ('GCCcore', '8.3.0')),
-]
-
-builddependencies = [
-    ('CMake', '3.16.2', '', True),
-    ('Eigen', '3.3.7', '', True),
-]
-
-configopts = "-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include\;$EBROOTLIBGLU/include "
-configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
-configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
-configopts += "-DWITH_ZLIB=ON -DWITH_MPFR=ON -DWITH_OpenGL=ON -DWITH_Eigen3=ON "
-configopts += "-DWITH_GMPXX=ON -DWITH_LAPACK=ON -DWITH_BLAS=ON "
-
-moduleclass = 'numlib'
diff --git a/g/gperftools/gperftools-2.8-GCCcore-9.3.0.eb b/g/gperftools/gperftools-2.8-GCCcore-9.3.0.eb
new file mode 100644
index 00000000..7c4ba93a
--- /dev/null
+++ b/g/gperftools/gperftools-2.8-GCCcore-9.3.0.eb
@@ -0,0 +1,29 @@
+# JH 2020
+
+easyblock = 'ConfigureMake'
+
+name = 'gperftools'
+version = '2.8'
+
+homepage = 'https://github.com/gperftools/gperftools'
+description = """gperftools are for use by developers so that they can create more robust applications.
+ Especially of use to those developing multi-threaded applications in C++ with templates.
+ Includes TCMalloc, heap-checker, heap-profiler and cpu-profiler."""
+
+toolchain = {'name': 'GCCcore', 'version': '9.3.0'}
+
+source_urls = ['https://github.com/gperftools/gperftools/releases/download/%(namelower)s-%(version)s']
+sources = [SOURCE_TAR_GZ]
+
+builddependencies = [('binutils', '2.34')]
+dependencies = [('libunwind', '1.3.1')]
+
+configopts = '--enable-libunwind'
+
+sanity_check_paths = {
+    'files': ['bin/pprof', 'lib/libprofiler.a', 'lib/libprofiler.%s' % SHLIB_EXT,
+              'lib/libtcmalloc.a', 'lib/libtcmalloc.%s' % SHLIB_EXT],
+    'dirs': []
+}
+
+moduleclass = 'tools'
diff --git a/l/LAMMPS/LAMMPS-20200505-intel-2020a.eb b/l/LAMMPS/LAMMPS-20200505-intel-2020a.eb
index 7eb03606..f10da033 100644
--- a/l/LAMMPS/LAMMPS-20200505-intel-2020a.eb
+++ b/l/LAMMPS/LAMMPS-20200505-intel-2020a.eb
@@ -20,13 +20,12 @@ source_urls = ['https://github.com/lammps/lammps/archive']
 sources = ['patch_5May2020.tar.gz']
 
 dependencies = [
-    ('tbb', '2017.6.196', '', True),
-    ('gperftools', '2.7', '', True),
+    ('tbb', '2020.1'),
+    ('gperftools', '2.8'),
 ]
 
 builddependencies = [
-#    ('Py', '3.6', '',  True),
-    ('CMake', '3.13.1', '', True),
+    ('CMake', '3.16.4'),
 ]
 
 # deprecated MEAM, REAX
diff --git a/n/netCDF/netCDF-4.7.3-intel-2020a.eb b/n/netCDF/netCDF-4.7.3-intel-2020a.eb
index 9dbc298d..be550cc4 100644
--- a/n/netCDF/netCDF-4.7.3-intel-2020a.eb
+++ b/n/netCDF/netCDF-4.7.3-intel-2020a.eb
@@ -17,14 +17,14 @@ source_urls = [
 ]
 
 dependencies = [
-    ('HDF5', '1.10.6'),
+    ('HDF5', '1.10.6', '', ('iimpi', '2020a')),
     ('cURL', '7.69.1'),
     ('Szip', '2.1.1'),
 ]
 
 builddependencies = [
-    ('CMake', '3.16.2', '', True),
-    ('Doxygen', '1.8.12', '', True),
+    ('CMake', '3.16.4'),
+    ('Doxygen', '1.8.17'),
 ]
 
 # make sure both static and shared libs are built
diff --git a/p/pytest/pytest-6.0.1-Python-3.8.2.eb b/p/pytest/pytest-6.0.1-intel-2020a-Python-3.8.2.eb
similarity index 100%
rename from p/pytest/pytest-6.0.1-Python-3.8.2.eb
rename to p/pytest/pytest-6.0.1-intel-2020a-Python-3.8.2.eb