diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index e05ab5ab32..28350459a5 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -1,6 +1,7 @@
 #!/bin/sh -ex
 
 export HOMEBREW_NO_EMOJI=1
+brew tap --repair
 brew update --quiet
 
 # workaround python issue on travis
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index ee0a8973f6..954c4d1776 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -1,5 +1,7 @@
 #include "water.hpp"
 
+#include <sstream>
+
 #include <osg/ClipNode>
 #include <osg/Depth>
 #include <osg/Fog>