diff --git a/platforms/sdl/sdl1/main.cpp b/platforms/sdl/sdl1/main.cpp
index 908e535da..d0af01237 100644
--- a/platforms/sdl/sdl1/main.cpp
+++ b/platforms/sdl/sdl1/main.cpp
@@ -92,6 +92,10 @@ static std::string getStoragePath()
     tmp = getenv("APPDATA");
     if (tmp)
         path = tmp;
+#elif defined(MC_PLATFORM_MAC)
+    tmp = getenv("HOME");
+    if (tmp)
+        path = std::string(tmp) + "/Library/Application Support";
 #else
     tmp = getenv("XDG_DATA_HOME");
     if (tmp)
diff --git a/platforms/sdl/sdl2/main.cpp b/platforms/sdl/sdl2/main.cpp
index 3cbaabbe5..68c341b10 100644
--- a/platforms/sdl/sdl2/main.cpp
+++ b/platforms/sdl/sdl2/main.cpp
@@ -415,6 +415,8 @@ int main(int argc, char *argv[])
 	std::string storagePath;
 #ifdef _WIN32
 	storagePath = getenv("APPDATA");
+#elif defined(MC_PLATFORM_MAC)
+	storagePath = std::string(getenv("HOME")) + "/Library/Application Support";
 #elif defined(__EMSCRIPTEN__) || defined(__SWITCH__)
 	storagePath = "";
 #elif defined(ANDROID)
diff --git a/source/client/options/Options.hpp b/source/client/options/Options.hpp
index d82d9e9e5..0e1e3faeb 100644
--- a/source/client/options/Options.hpp
+++ b/source/client/options/Options.hpp
@@ -163,7 +163,7 @@ class OptionInstance : public OptionEntry
 class BoolOption : public OptionInstance<bool>
 {
 public:
-	BoolOption(const std::string& key, const std::string& name, bool initial = true) : OptionInstance(key, name, initial) {}
+	BoolOption(const std::string& key, const std::string& name, bool initial = true) : OptionInstance<bool>(key, name, initial) {}
 
 	void load(const std::string& value) override;
 	void save(std::stringstream& ss) const override;
@@ -176,7 +176,7 @@ class FloatOption : public OptionInstance<float>
 {
 public:
 	FloatOption(const std::string& key, const std::string& name, float initial = 0.0f, float unit = 0.01f) :
-		OptionInstance(key, name, initial),
+		OptionInstance<float>(key, name, initial),
 		m_unit(unit)
 	{
 	}
@@ -228,7 +228,7 @@ class FancyGraphicsOption : public GraphicsOption
 class IntOption : public OptionInstance<int>
 {
 public:
-	IntOption(const std::string& key, const std::string& name, int initial = 0) : OptionInstance(key, name, initial) {}
+	IntOption(const std::string& key, const std::string& name, int initial = 0) : OptionInstance<int>(key, name, initial) {}
 
 	void load(const std::string& value) override;
 	void save(std::stringstream& ss) const override { ss << get(); }
@@ -237,7 +237,7 @@ class IntOption : public OptionInstance<int>
 class StringOption : public OptionInstance<std::string>
 {
 public:
-	StringOption(const std::string& key, const std::string& name, std::string initial = "") : OptionInstance(key, name, initial) {}
+	StringOption(const std::string& key, const std::string& name, std::string initial = "") : OptionInstance<std::string>(key, name, initial) {}
 
 	void load(const std::string& value) override { set(value); }
 	void save(std::stringstream& ss) const override { ss.str(get()); }
diff --git a/source/world/entity/SynchedEntityData.cpp b/source/world/entity/SynchedEntityData.cpp
index 9f82b6d5b..068a9b5d6 100644
--- a/source/world/entity/SynchedEntityData.cpp
+++ b/source/world/entity/SynchedEntityData.cpp
@@ -1,4 +1,6 @@
 #include <limits.h>
+#define __STDC_LIMIT_MACROS
+#include <stdint.h>
 
 #include "SynchedEntityData.hpp"