diff --git a/source/graphics/CinemaTrack.cpp b/source/graphics/CinemaTrack.cpp
index 9225cf7972..3e86dab9c4 100644
--- a/source/graphics/CinemaTrack.cpp
+++ b/source/graphics/CinemaTrack.cpp
@@ -369,7 +369,7 @@ int CCinemaManager::HACK_WriteTrack(CCinemaTrack track)
 	unsigned int fileID = 0x0ADC;
 	int numTracks = 1;
 
-	int numPaths = track.m_Paths.size();
+	size_t numPaths = track.m_Paths.size();
 
 	fwrite( &fileID, sizeof(fileID), 1, fp);
 	fwrite( &numTracks, sizeof(numTracks), 1, fp);
diff --git a/source/graphics/Terrain.cpp b/source/graphics/Terrain.cpp
index 82a423614f..9d059c6aa6 100755
--- a/source/graphics/Terrain.cpp
+++ b/source/graphics/Terrain.cpp
@@ -11,6 +11,9 @@
 #include "lib/res/graphics/ogl_tex.h"
 #include "lib/res/mem.h"
 
+#include "renderer/Renderer.h"
+#include "renderer/WaterManager.h"
+
 #include <string.h>
 #include "Terrain.h"
 #include "MathUtil.h"
@@ -50,7 +53,8 @@ bool CTerrain::Initialize(u32 size,const u16* data)
 	// store terrain size
 	m_MapSize=(size*PATCH_SIZE)+1;
 	m_MapSizePatches=size;
-
+	WaterManager *WaterMgr = g_Renderer.GetWaterManager();
+	WaterMgr->InitWave();
 	// allocate data for new terrain
 	m_Heightmap=new u16[m_MapSize*m_MapSize];
 	m_Patches=new CPatch[m_MapSizePatches*m_MapSizePatches];