diff --git a/scripts/linux-build-dependencies.sh b/scripts/linux-build-dependencies.sh
index f15110d3..caa9ac47 100755
--- a/scripts/linux-build-dependencies.sh
+++ b/scripts/linux-build-dependencies.sh
@@ -11,14 +11,6 @@
 # - Qt4
 #
 
-BASEDIR=$HOME/openscad_deps
-OPENSCADDIR=$PWD
-SRCDIR=$BASEDIR/src
-DEPLOYDIR=$BASEDIR
-if [ ! $NUMCPU ]; then
-	NUMCPU=1 # paralell builds for some libraries
-fi
-
 printUsage()
 {
   echo "Usage: $0"
@@ -222,7 +214,6 @@ build_eigen()
 }
 
 
-
 OPENSCADDIR=$PWD
 if [ ! -f $OPENSCADDIR/openscad.pro ]; then
   echo "Must be run from the OpenSCAD source root directory"
@@ -231,9 +222,10 @@ fi
 
 . ./scripts/setenv-linbuild.sh # '.' is equivalent to 'source'
 SRCDIR=$BASEDIR/src
-DEPLOYDIR=$BASEDIR
+
 if [ ! $NUMCPU ]; then
-  NUMCPU=1 # paralell builds for some libraries
+	echo "Note: The NUMCPU environment variable can be set for paralell builds"
+	NUMCPU=1 
 fi
 
 if [ ! -d $BASEDIR/bin ]; then
@@ -243,7 +235,7 @@ fi
 echo "Using basedir:" $BASEDIR
 echo "Using deploydir:" $DEPLOYDIR
 echo "Using srcdir:" $SRCDIR
-echo "Number of CPUs for parallel builds:" $NUMCPU "(export NUMCPU=x to modify)"
+echo "Number of CPUs for parallel builds:" $NUMCPU
 mkdir -p $SRCDIR $DEPLOYDIR
 
 if [ ! "`command -v curl`" ]; then
diff --git a/src/import.cc b/src/import.cc
index 9d011b04..dc40c8db 100644
--- a/src/import.cc
+++ b/src/import.cc
@@ -118,7 +118,7 @@ PolySet *ImportNode::evaluate_polyset(class PolySetEvaluator *) const
 
 	if (this->type == TYPE_STL)
 	{
-		handle_dep(this->filename);
+		handle_dep((std::string)this->filename);
 		std::ifstream f(this->filename.c_str(), std::ios::in | std::ios::binary);
 		if (!f.good()) {
 			PRINTB("WARNING: Can't open import file '%s'.", this->filename);
@@ -237,7 +237,7 @@ PolySet *ImportNode::evaluate_polyset(class PolySetEvaluator *) const
 std::string ImportNode::toString() const
 {
 	std::stringstream stream;
-	fs::path path(this->filename);
+	fs::path path((std::string)this->filename);
 
 	stream << this->name();
 	stream << "(file = " << this->filename << ", "
diff --git a/src/linearextrude.cc b/src/linearextrude.cc
index 4d2730ca..43db9079 100644
--- a/src/linearextrude.cc
+++ b/src/linearextrude.cc
@@ -146,7 +146,7 @@ std::string LinearExtrudeNode::toString() const
 
 	stream << this->name() << "(";
 	if (!this->filename.empty()) { // Ignore deprecated parameters if empty 
-		fs::path path(this->filename);
+		fs::path path((std::string)this->filename);
 		stream <<
 			"file = " << this->filename << ", "
 			"layer = " << QuotedString(this->layername) << ", "
diff --git a/src/rotateextrude.cc b/src/rotateextrude.cc
index 165d03b8..dc8ea34e 100644
--- a/src/rotateextrude.cc
+++ b/src/rotateextrude.cc
@@ -115,7 +115,7 @@ std::string RotateExtrudeNode::toString() const
 
 	stream << this->name() << "(";
 	if (!this->filename.empty()) { // Ignore deprecated parameters if empty 
-		fs::path path(this->filename);
+		fs::path path((std::string)this->filename);
 		stream <<
 			"file = " << this->filename << ", "
 			"layer = " << QuotedString(this->layername) << ", "
diff --git a/src/surface.cc b/src/surface.cc
index d962e38a..2fa37179 100644
--- a/src/surface.cc
+++ b/src/surface.cc
@@ -225,7 +225,7 @@ PolySet *SurfaceNode::evaluate_polyset(class PolySetEvaluator *) const
 std::string SurfaceNode::toString() const
 {
 	std::stringstream stream;
-	fs::path path(this->filename);
+	fs::path path((std::string)this->filename);
 
 	stream << this->name() << "(file = " << this->filename << ", "
 		"center = " << (this->center ? "true" : "false")
diff --git a/src/value.cc b/src/value.cc
index 2602f32e..666062a3 100644
--- a/src/value.cc
+++ b/src/value.cc
@@ -25,7 +25,8 @@
  */
 
 #include "value.h"
-#include <assert.h>
+#include <math.h>
+#include <assert.h> // fmod
 #include <sstream>
 #include <boost/foreach.hpp>
 #include <boost/variant/apply_visitor.hpp>