diff --git a/src/Mara/Gui/MainWindow.cpp b/src/Mara/Gui/MainWindow.cpp
index 62d6a60649ad2066f66cf1130e6e34a28a94fe15..6d361e732b0154d935c7bda70e61ebeaa2dd4607 100644
--- a/src/Mara/Gui/MainWindow.cpp
+++ b/src/Mara/Gui/MainWindow.cpp
@@ -28,8 +28,10 @@
 
 #include <RadiumPlayer.hpp>
 
+#ifdef RADIUM_HAS_SKELETON_ANIM
 #include <Engine/Scene/SkeletonBasedAnimationSystem.hpp>
 #include <Gui/SkeletonBasedAnimation/SkeletonBasedAnimationUI.hpp>
+#endif
 
 using namespace Ra::Gui;
 using namespace Ra::Engine;
@@ -541,6 +543,7 @@ void MainWindow::timelineSetPingPong( bool status ) {
 }
 
 void MainWindow::addRadiumSystemsUI() {
+#ifdef RADIUM_HAS_SKELETON_ANIM
     // Register the Skeleton-based animation UI
     auto animSystem = static_cast<Ra::Engine::Scene::SkeletonBasedAnimationSystem*>(
         Ra::Engine::RadiumEngine::getInstance()->getSystem( "SkeletonBasedAnimationSystem" ) );
@@ -558,5 +561,6 @@ void MainWindow::addRadiumSystemsUI() {
              &MainWindow::selectedItem,
              skelAnimUI,
              &Ra::Gui::SkeletonBasedAnimationUI::selectionChanged );
+ #endif
 }
 } // namespace Mara
diff --git a/src/Mara/RadiumPlayer.hpp b/src/Mara/RadiumPlayer.hpp
index baa27ab13b0030b93748a9c8f06f0ff482c6867d..d377a0496814e0075bebea136592c444f578ca25 100644
--- a/src/Mara/RadiumPlayer.hpp
+++ b/src/Mara/RadiumPlayer.hpp
@@ -1,6 +1,9 @@
 #pragma once
 
 #include <Gui/BaseApplication.hpp>
+
+#include<optional>
+
 namespace Mara {
 class RadiumPlayer : public Ra::Gui::BaseApplication
 {
diff --git a/src/libRender/RadiumNBR/EnvMap.cpp b/src/libRender/RadiumNBR/EnvMap.cpp
index 748cd8cb75cb32f18ec5890e4222194ed68d14a1..f98b7484dc7b7b02c0c704078ac1581a10334572 100644
--- a/src/libRender/RadiumNBR/EnvMap.cpp
+++ b/src/libRender/RadiumNBR/EnvMap.cpp
@@ -35,7 +35,7 @@ using namespace gl;
 template <typename T>
 void flip_horizontally( T* img, size_t w, size_t h, size_t c ) {
 #pragma omp parallel for
-    for ( size_t r = 0; r < h; ++r )
+    for ( int r = 0; r < int(h); ++r )
     {
         for ( size_t l = 0; l < w / 2; ++l )
         {