diff --git a/SConscript b/SConscript
index 2ac687dad..4e480f4b3 100644
--- a/SConscript
+++ b/SConscript
@@ -285,10 +285,15 @@ if(GetOption('win')):
 	envCopy.Append(CCFLAGS=['-mincoming-stack-boundary=2'])
 	sources+=envCopy.Object('src/simulation/Gravity.cpp')
 
-env.Command(['generated/ElementClasses.cpp', 'generated/ElementClasses.h'], Glob('src/simulation/elements/*.cpp'), "python2 generator.py elements $TARGETS $SOURCES")
+if(GetOption('lin')):
+	pythonVer = "python2"
+else:
+	pythonVer = "python"
+
+env.Command(['generated/ElementClasses.cpp', 'generated/ElementClasses.h'], Glob('src/simulation/elements/*.cpp'), pythonVer + " generator.py elements $TARGETS $SOURCES")
 sources+=Glob("generated/ElementClasses.cpp")
 
-env.Command(['generated/ToolClasses.cpp', 'generated/ToolClasses.h'], Glob('src/simulation/tools/*.cpp'), "python2 generator.py tools $TARGETS $SOURCES")
+env.Command(['generated/ToolClasses.cpp', 'generated/ToolClasses.h'], Glob('src/simulation/tools/*.cpp'), pythonVer + " generator.py tools $TARGETS $SOURCES")
 sources+=Glob("generated/ToolClasses.cpp")
 
 env.Decider('MD5')
diff --git a/src/client/ThumbnailBroker.cpp b/src/client/ThumbnailBroker.cpp
index 92ccfd86b..85fee3a80 100644
--- a/src/client/ThumbnailBroker.cpp
+++ b/src/client/ThumbnailBroker.cpp
@@ -1,6 +1,7 @@
 #include <algorithm>
 #include <iostream>
 #include <typeinfo>
+#include <time.h>
 #include "ThumbnailBroker.h"
 #include "ThumbnailListener.h"
 #include "Client.h"
diff --git a/src/search/SearchController.cpp b/src/search/SearchController.cpp
index 44ff68148..012b761b3 100644
--- a/src/search/SearchController.cpp
+++ b/src/search/SearchController.cpp
@@ -1,5 +1,6 @@
 #include <string>
 #include <sstream>
+#include <time.h>
 #include "SearchController.h"
 #include "SearchModel.h"
 #include "SearchView.h"