diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00bbdda7d78e08103c28b8627e9a4d35214914af..c7bbbebca7493a75c94b0ec6cf0e4dd3b2df5b18 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -115,9 +115,9 @@ endif()
 
 install(DIRECTORY ${PYMOOSE_INSTALL_DIR}/usr/
     DESTINATION ${CMAKE_INSTALL_PREFIX}
+    CONFIGURATIONS Release
     PATTERN ".git" EXCLUDE
     PATTERN "*.pyc" EXCLUDE
-    CONFIGURATIONS Release
     )
 
 if(WITH_GUI)
@@ -125,18 +125,18 @@ if(WITH_GUI)
     set(MOOSE_GUI_DIR ${CMAKE_SOURCE_DIR}/moose-gui)
     install(DIRECTORY ${MOOSE_GUI_INSTALL_DIR}/
         DESTINATION lib/moose/gui
+        CONFIGURATIONS Release
         PATTERN ".git*" EXCLUDE
         PATTERN "*.pyc" EXCLUDE
-        CONFIGURATIONS Release
         )
 
     install(DIRECTORY ${MOOSE_EXAMPLE_DIR}/
         DESTINATION lib/moose/moose-examples
+        CONFIGURATIONS Release
         PATTERN ".git*" EXCLUDE 
         PATTERN "_travis*" EXCLUDE
         PATTERN ".travis*" EXCLUDE
         PATTERN "*.pyc" EXCLUDE
-        CONFIGURATIONS Release
         )
 
     configure_file( ${CMAKE_SOURCE_DIR}/cmake/moosegui.in ${CMAKE_BINARY_DIR}/moosegui )
diff --git a/cmake/build_moose-core.sh.in b/cmake/build_moose-core.sh.in
index b753f8523fdad7d2a940adf4a9a16c44ff8eca13..0cf1778e0c0807a2236067036e3ece7cc9ba04f8 100755
--- a/cmake/build_moose-core.sh.in
+++ b/cmake/build_moose-core.sh.in
@@ -6,8 +6,9 @@ set -e
 # NOTICE: This file is parsed by cmake to create a shell script. Not all syntax
 # will play well with cmake. CMAKE replaces @FOO@ and ${FOO} with cmake variable
 # values.
+NPROC=$(nproc)
 if [ -z $MAKEOPTS ]; then
-    export MAKEOPTS="-j5"
+    export MAKEOPTS="-j${NPROC}"
 fi
 
 echo "Building pymoose and creating bdist."