diff --git a/src/Decorations.cpp b/src/Decorations.cpp
index 36fcd32..5bf7430 100644
--- a/src/Decorations.cpp
+++ b/src/Decorations.cpp
@@ -17,6 +17,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
 **/
 
+#define GLM_ENABLE_EXPERIMENTAL
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtx/vector_angle.hpp>
 #include <glm/gtx/component_wise.hpp>
diff --git a/src/DisplaysView.cpp b/src/DisplaysView.cpp
index 9e03529..b59f6c1 100644
--- a/src/DisplaysView.cpp
+++ b/src/DisplaysView.cpp
@@ -26,9 +26,8 @@
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/matrix_access.hpp>
+#define GLM_ENABLE_EXPERIMENTAL
 #include <glm/gtx/vector_angle.hpp>
-//#include <iostream>
-//#include <glm/gtx/io.hpp>
 
 #include "ImGuiToolkit.h"
 #include "imgui_internal.h"
diff --git a/src/GeometryView.cpp b/src/GeometryView.cpp
index 8a7e76c..908a7de 100644
--- a/src/GeometryView.cpp
+++ b/src/GeometryView.cpp
@@ -22,9 +22,11 @@
 #include <iomanip>
 
 #include <glad/glad.h>
+
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/matrix_access.hpp>
+#define GLM_ENABLE_EXPERIMENTAL
 #include <glm/gtx/vector_angle.hpp>
 #include <glm/gtx/component_wise.hpp>
 
diff --git a/src/GlmToolkit.cpp b/src/GlmToolkit.cpp
index 4ab8dc8..ef66e57 100644
--- a/src/GlmToolkit.cpp
+++ b/src/GlmToolkit.cpp
@@ -22,8 +22,9 @@
 
 #include <glm/gtc/matrix_access.hpp>
 #include <glm/gtc/matrix_transform.hpp>
-#include <glm/gtx/vector_angle.hpp>
 #include <glm/gtc/random.hpp>
+#define GLM_ENABLE_EXPERIMENTAL
+#include <glm/gtx/vector_angle.hpp>
 
 #include "GlmToolkit.h"
 
diff --git a/src/Grid.cpp b/src/Grid.cpp
index be6ebb8..a2a600e 100644
--- a/src/Grid.cpp
+++ b/src/Grid.cpp
@@ -17,6 +17,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
 **/
 
+#define GLM_ENABLE_EXPERIMENTAL
 #include <glm/gtx/vector_angle.hpp>
 
 #include "Primitives.h"
diff --git a/src/LayerView.cpp b/src/LayerView.cpp
index 7a9c151..ad144eb 100644
--- a/src/LayerView.cpp
+++ b/src/LayerView.cpp
@@ -21,6 +21,7 @@
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/matrix_access.hpp>
+#define GLM_ENABLE_EXPERIMENTAL
 #include <glm/gtx/vector_angle.hpp>
 
 #include "ImGuiToolkit.h"
diff --git a/src/Mesh.cpp b/src/Mesh.cpp
index 9f786fd..273902d 100644
--- a/src/Mesh.cpp
+++ b/src/Mesh.cpp
@@ -28,7 +28,7 @@
 #include <glad/glad.h>
 
 #include <glm/gtc/matrix_transform.hpp>
-#include <glm/gtx/vector_angle.hpp>
+// #include <glm/gtx/vector_angle.hpp>
 
 #include "Shader.h"
 #include "Resource.h"
diff --git a/src/MixingGroup.cpp b/src/MixingGroup.cpp
index 1a48cb5..e3e0b55 100644
--- a/src/MixingGroup.cpp
+++ b/src/MixingGroup.cpp
@@ -19,6 +19,7 @@
 
 #include <algorithm>
 
+#define GLM_ENABLE_EXPERIMENTAL
 #include <glm/gtx/vector_angle.hpp>
 #include <glm/gtx/rotate_vector.hpp>
 
diff --git a/src/MixingView.cpp b/src/MixingView.cpp
index 3d71582..e0a725d 100644
--- a/src/MixingView.cpp
+++ b/src/MixingView.cpp
@@ -25,6 +25,7 @@
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/matrix_access.hpp>
+#define GLM_ENABLE_EXPERIMENTAL
 #include <glm/gtx/vector_angle.hpp>
 
 #include "ImGuiToolkit.h"
diff --git a/src/PickingVisitor.cpp b/src/PickingVisitor.cpp
index 0ccbbdd..f3fd5e5 100644
--- a/src/PickingVisitor.cpp
+++ b/src/PickingVisitor.cpp
@@ -20,6 +20,7 @@
 #include <glm/gtc/type_ptr.hpp>
 #include <glm/gtc/matrix_access.hpp>
 #include <glm/gtc/matrix_transform.hpp>
+#define GLM_ENABLE_EXPERIMENTAL
 #include <glm/gtx/vector_angle.hpp>
 
 #include "Decorations.h"
diff --git a/src/Primitives.cpp b/src/Primitives.cpp
index c798394..bacbe07 100644
--- a/src/Primitives.cpp
+++ b/src/Primitives.cpp
@@ -23,10 +23,10 @@
 #include <glm/gtc/type_ptr.hpp>
 #include <glm/gtc/matrix_access.hpp>
 #include <glm/gtc/matrix_transform.hpp>
-#include <glm/gtx/vector_angle.hpp>
 #include <glm/gtc/constants.hpp>
 #define GLM_ENABLE_EXPERIMENTAL
 #include <glm/gtx/rotate_vector.hpp>
+#include <glm/gtx/vector_angle.hpp>
 
 #include "Resource.h"
 #include "FrameBuffer.h"
diff --git a/src/RenderView.cpp b/src/RenderView.cpp
index 1472925..59c617b 100644
--- a/src/RenderView.cpp
+++ b/src/RenderView.cpp
@@ -24,7 +24,7 @@
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/matrix_access.hpp>
-#include <glm/gtx/vector_angle.hpp>
+// #include <glm/gtx/vector_angle.hpp>
 
 #include "defines.h"
 #include "Settings.h"
diff --git a/src/SessionCreator.cpp b/src/SessionCreator.cpp
index 86a979b..6fdf6f6 100644
--- a/src/SessionCreator.cpp
+++ b/src/SessionCreator.cpp
@@ -885,15 +885,15 @@ void SessionLoader::visit(MediaPlayer &n)
                 tl.setTiming( interval_, n.timeline()->step());
             else
             {
-                GstClockTime b = GST_CLOCK_TIME_NONE;
-                GstClockTime e = GST_CLOCK_TIME_NONE;
-                GstClockTime s = GST_CLOCK_TIME_NONE;
+                uint64_t b = GST_CLOCK_TIME_NONE;
+                uint64_t e = GST_CLOCK_TIME_NONE;
+                uint64_t s = GST_CLOCK_TIME_NONE;
                 timelineelement->QueryUnsigned64Attribute("begin", &b);
                 timelineelement->QueryUnsigned64Attribute("end", &e);
                 timelineelement->QueryUnsigned64Attribute("step", &s);
-                interval_ = TimeInterval(b,e);
+                interval_ = TimeInterval( (GstClockTime) b, (GstClockTime) e);
                 if (interval_.is_valid())
-                    tl.setTiming( interval_, s);
+                    tl.setTiming( interval_, (GstClockTime) s);
             }
 
             XMLElement *gapselement = timelineelement->FirstChildElement("Gaps");
@@ -901,11 +901,11 @@ void SessionLoader::visit(MediaPlayer &n)
                 XMLElement* gap = gapselement->FirstChildElement("Interval");
                 for( ; gap ; gap = gap->NextSiblingElement())
                 {
-                    GstClockTime a = GST_CLOCK_TIME_NONE;
-                    GstClockTime b = GST_CLOCK_TIME_NONE;
+                    uint64_t a = GST_CLOCK_TIME_NONE;
+                    uint64_t b = GST_CLOCK_TIME_NONE;
                     gap->QueryUnsigned64Attribute("begin", &a);
                     gap->QueryUnsigned64Attribute("end", &b);
-                    tl.addGap( a, b );
+                    tl.addGap( (GstClockTime) a, (GstClockTime) b );
                 }
             }
             XMLElement *fadingselement = timelineelement->FirstChildElement("Fading");
diff --git a/src/SessionVisitor.cpp b/src/SessionVisitor.cpp
index 267f272..a770759 100644
--- a/src/SessionVisitor.cpp
+++ b/src/SessionVisitor.cpp
@@ -444,17 +444,17 @@ void SessionVisitor::visit(MediaPlayer &n)
 
         // timeline
         XMLElement *timelineelement = xmlDoc_->NewElement("Timeline");
-        timelineelement->SetAttribute("begin", n.timeline()->begin());
-        timelineelement->SetAttribute("end", n.timeline()->end());
-        timelineelement->SetAttribute("step", n.timeline()->step());
+        timelineelement->SetAttribute("begin", (uint64_t) n.timeline()->begin());
+        timelineelement->SetAttribute("end", (uint64_t) n.timeline()->end());
+        timelineelement->SetAttribute("step", (uint64_t) n.timeline()->step());
 
         // gaps in timeline
         XMLElement *gapselement = xmlDoc_->NewElement("Gaps");
         TimeIntervalSet gaps = n.timeline()->gaps();
         for( auto it = gaps.begin(); it!= gaps.end(); ++it) {
             XMLElement *g = xmlDoc_->NewElement("Interval");
-            g->SetAttribute("begin", (*it).begin);
-            g->SetAttribute("end", (*it).end);
+            g->SetAttribute("begin", (uint64_t) (*it).begin);
+            g->SetAttribute("end", (uint64_t) (*it).end);
             gapselement->InsertEndChild(g);
         }
         timelineelement->InsertEndChild(gapselement);
diff --git a/src/Shader.cpp b/src/Shader.cpp
index 6eb35f4..3a3148d 100644
--- a/src/Shader.cpp
+++ b/src/Shader.cpp
@@ -28,7 +28,6 @@
 #include <GLFW/glfw3.h>
 
 #include <glm/gtc/type_ptr.hpp>
-#define GLM_ENABLE_EXPERIMENTAL
 
 #include "Resource.h"
 #include "Log.h"
diff --git a/src/SourceCallback.cpp b/src/SourceCallback.cpp
index fee25bd..0290d15 100644
--- a/src/SourceCallback.cpp
+++ b/src/SourceCallback.cpp
@@ -692,7 +692,7 @@ SourceCallback *Seek::reverse(Source *s) const
 {
     MediaSource *ms = dynamic_cast<MediaSource *>(s);
     if (ms != nullptr && bidirectional_)
-        return new Seek( ms->mediaplayer()->position() );
+        return new Seek( (glm::uint64) ms->mediaplayer()->position() );
     return nullptr;
 }
 
diff --git a/src/SourceList.cpp b/src/SourceList.cpp
index e734c2f..7c779d2 100644
--- a/src/SourceList.cpp
+++ b/src/SourceList.cpp
@@ -19,6 +19,7 @@
 
 #include <algorithm>
 
+#define GLM_ENABLE_EXPERIMENTAL
 #include <glm/gtx/vector_angle.hpp>
 #include <glm/gtx/rotate_vector.hpp>
 
diff --git a/src/TextureView.cpp b/src/TextureView.cpp
index ac82a1a..894cced 100644
--- a/src/TextureView.cpp
+++ b/src/TextureView.cpp
@@ -21,6 +21,7 @@
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/matrix_access.hpp>
+#define GLM_ENABLE_EXPERIMENTAL
 #include <glm/gtx/vector_angle.hpp>
 
 #include <string>