diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4ab84a2f5..474d38cf0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,8 +66,7 @@ debian8.10:
     - apt-get install -y --no-install-recommends build-essential libtool automake libhdf5-dev cmake git ca-certificates libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libgtest-dev
     - cd build
     - cmake -DENABLE_OSMOSDR=ON ..
-    - grep -c ^processor /proc/cpuinfo
-    - export NPROC=$(grep -c ^processor /proc/cpuinfo)
+    - NPROC=$(grep -c ^processor /proc/cpuinfo)
     - make -j$(($NPROC+1))
     - make check
     - make install
@@ -81,8 +80,7 @@ debian9.3:
     - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest
     - cd build
     - cmake -DENABLE_OSMOSDR=ON ..
-    - grep -c ^processor /proc/cpuinfo
-    - export NPROC=$(grep -c ^processor /proc/cpuinfo)
+    - NPROC=$(grep -c ^processor /proc/cpuinfo)
     - make -j$(($NPROC+1))
     - make check
     - make install
@@ -96,8 +94,7 @@ debian9.3-i386:
     - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest
     - cd build
     - cmake -DENABLE_PACKAGING=ON -DENABLE_OSMOSDR=ON ..
-    - grep -c ^processor /proc/cpuinfo
-    - export NPROC=$(grep -c ^processor /proc/cpuinfo)
+    - NPROC=$(grep -c ^processor /proc/cpuinfo)
     - make -j$(($NPROC+1))
     - make check
     - make install
@@ -111,8 +108,7 @@ debian10:
     - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest
     - cd build
     - cmake -DENABLE_OSMOSDR=ON ..
-    - grep -c ^processor /proc/cpuinfo
-    - export NPROC=$(grep -c ^processor /proc/cpuinfo)
+    - NPROC=$(grep -c ^processor /proc/cpuinfo)
     - make -j$(($NPROC+1))
     - make check
     - make install
@@ -131,8 +127,7 @@ ubuntu14.04:
     - apt-get install -y --no-install-recommends build-essential libtool automake libhdf5-dev cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libgtest-dev
     - cd build
     - cmake ..
-    - grep -c ^processor /proc/cpuinfo
-    - export NPROC=$(grep -c ^processor /proc/cpuinfo)
+    - NPROC=$(grep -c ^processor /proc/cpuinfo)
     - make -j$(($NPROC+1))
     - make check
     - make install
@@ -146,8 +141,7 @@ ubuntu16.04:
     - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev libgtest-dev
     - cd build
     - cmake -DENABLE_OSMOSDR=ON ..
-    - grep -c ^processor /proc/cpuinfo
-    - export NPROC=$(grep -c ^processor /proc/cpuinfo)
+    - NPROC=$(grep -c ^processor /proc/cpuinfo)
     - make -j$(($NPROC+1))
     - make check
     - make install
@@ -161,8 +155,7 @@ ubuntu18.04:
     - apt-get install -y --no-install-recommends build-essential cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest
     - cd build
     - cmake -DENABLE_OSMOSDR=ON ..
-    - grep -c ^processor /proc/cpuinfo
-    - export NPROC=$(grep -c ^processor /proc/cpuinfo)
+    - NPROC=$(grep -c ^processor /proc/cpuinfo)
     - make -j$(($NPROC+1))
     - make check
     - make install
@@ -178,8 +171,7 @@ fedora26:
     - yum install -y make automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel gnutls-devel openssl-devel python-mako python-six matio-devel
     - cd build
     - cmake -DENABLE_OSMOSDR=ON ..
-    - grep -c ^processor /proc/cpuinfo
-    - export NPROC=$(grep -c ^processor /proc/cpuinfo)
+    - NPROC=$(grep -c ^processor /proc/cpuinfo)
     - make -j$(($NPROC+1))
     - make check
     - make install
@@ -194,8 +186,7 @@ fedora27:
     - yum install -y make automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel gnutls-devel openssl-devel python-mako python-six matio-devel
     - cd build
     - cmake -DENABLE_OSMOSDR=ON ..
-    - grep -c ^processor /proc/cpuinfo
-    - export NPROC=$(grep -c ^processor /proc/cpuinfo)
+    - NPROC=$(grep -c ^processor /proc/cpuinfo)
     - make -j$(($NPROC+1))
     - make check
     - make install
@@ -210,8 +201,7 @@ fedora-rawhide:
     - yum install -y automake gcc gcc-c++ kernel-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gflags-devel glog-devel gnutls-devel openssl-devel python-mako python-six matio-devel
     - cd build
     - cmake -DENABLE_OSMOSDR=ON ..
-    - grep -c ^processor /proc/cpuinfo
-    - export NPROC=$(grep -c ^processor /proc/cpuinfo)
+    - NPROC=$(grep -c ^processor /proc/cpuinfo)
     - make -j$(($NPROC+1))
     - make check
     - make install
@@ -228,8 +218,7 @@ archlinux:
     - pacman -S --noconfirm cmake git boost boost-libs log4cpp libvolk gnuradio gnuradio-osmosdr blas lapack gflags google-glog gnutls openssl python2-mako python2-six libmatio gtest
     - cd build
     - cmake -DENABLE_OSMOSDR=ON ..
-    - grep -c ^processor /proc/cpuinfo
-    - export NPROC=$(grep -c ^processor /proc/cpuinfo)
+    - NPROC=$(grep -c ^processor /proc/cpuinfo)
     - make -j$(($NPROC+1))
     - make check
     - make install
@@ -248,8 +237,7 @@ centos7:
     - yum install -y make automake gcc gcc-c++ kernel-devel libtool hdf5-devel cmake git boost-devel boost-date-time boost-system boost-filesystem boost-thread boost-chrono boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr-devel blas-devel lapack-devel armadillo-devel gnutls-devel openssl-devel python-mako python-six
     - cd build
     - cmake -DENABLE_OSMOSDR=ON ..
-    - grep -c ^processor /proc/cpuinfo
-    - export NPROC=$(grep -c ^processor /proc/cpuinfo)
+    - NPROC=$(grep -c ^processor /proc/cpuinfo)
     - make -j$(($NPROC+1))
     - make check
     - make install
@@ -285,8 +273,7 @@ run-tests:
     - mkdir build64
     - cd build-test
     - cmake -DENABLE_SYSTEM_TESTING_EXTRA=ON ..
-    - grep -c ^processor /proc/cpuinfo
-    - export NPROC=$(grep -c ^processor /proc/cpuinfo)
+    - NPROC=$(grep -c ^processor /proc/cpuinfo)
     - make -j$(($NPROC+1))
     # Execute Unit Tests
     - ../install/run_tests --gtest_output=xml
@@ -313,8 +300,7 @@ run-tests-i386:
     - mkdir build32
     - cd build-test
     - cmake -DENABLE_PACKAGING=ON -DENABLE_SYSTEM_TESTING_EXTRA=ON ..
-    - grep -c ^processor /proc/cpuinfo
-    - export NPROC=$(grep -c ^processor /proc/cpuinfo)
+    - NPROC=$(grep -c ^processor /proc/cpuinfo)
     - make -j$(($NPROC+1))
     # Execute Unit Tests
     - ../install/run_tests --gtest_output=xml