diff --git a/desktop_version/src/BinaryBlob.cpp b/desktop_version/src/BinaryBlob.cpp
index a134fc97..94fff1ea 100644
--- a/desktop_version/src/BinaryBlob.cpp
+++ b/desktop_version/src/BinaryBlob.cpp
@@ -11,6 +11,7 @@ binaryBlob::binaryBlob()
 {
 	numberofHeaders = 0;
 	SDL_memset(m_headers, 0, sizeof(m_headers));
+	SDL_memset(m_memblocks, 0, sizeof(m_memblocks));
 }
 
 #ifdef VVV_COMPILEMUSIC
diff --git a/desktop_version/src/BlockV.cpp b/desktop_version/src/BlockV.cpp
index 249db33e..b5a73296 100644
--- a/desktop_version/src/BlockV.cpp
+++ b/desktop_version/src/BlockV.cpp
@@ -19,6 +19,9 @@ blockclass::blockclass()
 	r = 0;
 	g = 0;
 	b = 0;
+
+	x = 0.0f;
+	y = 0.0f;
 }
 
 void blockclass::rectset(const int xi, const int yi, const int wi, const int hi)
diff --git a/desktop_version/src/Entity.cpp b/desktop_version/src/Entity.cpp
index 038f8839..256a882c 100644
--- a/desktop_version/src/Entity.cpp
+++ b/desktop_version/src/Entity.cpp
@@ -72,6 +72,28 @@ void entityclass::init()
     resetallflags();
     SDL_memset(collect, false, sizeof(collect));
     SDL_memset(customcollect, false, sizeof(customcollect));
+
+    colpoint1 = point();
+    colpoint2 = point();
+    tempx = 0;
+    tempy = 0;
+    tempw = 0;
+    temph = 0;
+    temp = 0;
+    temp2 = 0;
+    tpx1 = 0;
+    tpy1 = 0;
+    tpx2 = 0;
+    tpy2 = 0;
+    x = 0;
+    k = 0;
+    dx = 0.0f;
+    dy = 0.0f;
+    dr = 0.0f;
+    px = 0;
+    py = 0;
+    linetemp = 0;
+    activetrigger = 0;
 }
 
 void entityclass::resetallflags()
diff --git a/desktop_version/src/Graphics.cpp b/desktop_version/src/Graphics.cpp
index 54a69ac6..7c9ddcb7 100644
--- a/desktop_version/src/Graphics.cpp
+++ b/desktop_version/src/Graphics.cpp
@@ -114,6 +114,8 @@ void Graphics::init()
     tl = point();
     towerbuffer = NULL;
     towerbuffer_lerp = NULL;
+    footerbuffer = NULL;
+    ghostbuffer = NULL;
     trinketr = 0;
     trinketg = 0;
     trinketb = 0;
diff --git a/desktop_version/src/GraphicsResources.cpp b/desktop_version/src/GraphicsResources.cpp
index f22a60c5..12c3eaaf 100644
--- a/desktop_version/src/GraphicsResources.cpp
+++ b/desktop_version/src/GraphicsResources.cpp
@@ -109,26 +109,31 @@ void GraphicsResources::init(void)
 
 void GraphicsResources::destroy(void)
 {
-	SDL_FreeSurface(im_tiles);
-	SDL_FreeSurface(im_tiles2);
-	SDL_FreeSurface(im_tiles3);
-	SDL_FreeSurface(im_entcolours);
-	SDL_FreeSurface(im_sprites);
-	SDL_FreeSurface(im_flipsprites);
-	SDL_FreeSurface(im_bfont);
-	SDL_FreeSurface(im_teleporter);
+#define CLEAR(img) \
+	SDL_FreeSurface(img); \
+	img = NULL;
 
-	SDL_FreeSurface(im_image0);
-	SDL_FreeSurface(im_image1);
-	SDL_FreeSurface(im_image2);
-	SDL_FreeSurface(im_image3);
-	SDL_FreeSurface(im_image4);
-	SDL_FreeSurface(im_image5);
-	SDL_FreeSurface(im_image6);
-	SDL_FreeSurface(im_image7);
-	SDL_FreeSurface(im_image8);
-	SDL_FreeSurface(im_image9);
-	SDL_FreeSurface(im_image10);
-	SDL_FreeSurface(im_image11);
-	SDL_FreeSurface(im_image12);
+	CLEAR(im_tiles);
+	CLEAR(im_tiles2);
+	CLEAR(im_tiles3);
+	CLEAR(im_entcolours);
+	CLEAR(im_sprites);
+	CLEAR(im_flipsprites);
+	CLEAR(im_bfont);
+	CLEAR(im_teleporter);
+
+	CLEAR(im_image0);
+	CLEAR(im_image1);
+	CLEAR(im_image2);
+	CLEAR(im_image3);
+	CLEAR(im_image4);
+	CLEAR(im_image5);
+	CLEAR(im_image6);
+	CLEAR(im_image7);
+	CLEAR(im_image8);
+	CLEAR(im_image9);
+	CLEAR(im_image10);
+	CLEAR(im_image11);
+	CLEAR(im_image12);
+#undef CLEAR
 }
diff --git a/desktop_version/src/KeyPoll.cpp b/desktop_version/src/KeyPoll.cpp
index d8b2676e..0c851c6c 100644
--- a/desktop_version/src/KeyPoll.cpp
+++ b/desktop_version/src/KeyPoll.cpp
@@ -57,6 +57,8 @@ KeyPoll::KeyPoll()
 	linealreadyemptykludge = false;
 
 	pauseStart = 0;
+
+	isActive = true;
 }
 
 void KeyPoll::enabletextentry()
diff --git a/desktop_version/src/Map.cpp b/desktop_version/src/Map.cpp
index fb1c2c2a..9b04caf7 100644
--- a/desktop_version/src/Map.cpp
+++ b/desktop_version/src/Map.cpp
@@ -76,6 +76,21 @@ mapclass::mapclass()
 	ypos = 0;
 	oldypos = 0;
 	bypos = 0;
+
+	background = 0;
+	cameramode = 0;
+	cameraseek = 0;
+	minitowermode = false;
+	scrolldir = 0;
+	check = 0;
+	cmode = 0;
+	towercol = 0;
+	tdrawback = false;
+	bscroll = 0;
+	roomtexton = false;
+	kludge_bypos = 0;
+	kludge_colstate = 0;
+	kludge_scrolldir = 0;
 }
 
 //Areamap starts at 100,100 and extends 20x20
diff --git a/desktop_version/src/Music.cpp b/desktop_version/src/Music.cpp
index ce29c5c7..959bc3e2 100644
--- a/desktop_version/src/Music.cpp
+++ b/desktop_version/src/Music.cpp
@@ -132,6 +132,9 @@ void musicclass::init()
 	songEnd = 0;
 
 	Mix_HookMusicFinished(&songend);
+
+	mmmmmm = false;
+	usingmmmmmm = false;
 }
 
 void songend()
diff --git a/desktop_version/src/Textbox.cpp b/desktop_version/src/Textbox.cpp
index 8d63781a..34f01ee2 100644
--- a/desktop_version/src/Textbox.cpp
+++ b/desktop_version/src/Textbox.cpp
@@ -13,6 +13,20 @@ textboxclass::textboxclass()
     tm = 0;
     timer = 0;
     allowspecial = false;
+
+    xp = 0;
+    yp = 0;
+    r = 0;
+    g = 0;
+    b = 0;
+    tr = 0;
+    tg = 0;
+    tb = 0;
+    max = 0;
+    textrect.x = 0;
+    textrect.y = 0;
+    textrect.w = 0;
+    textrect.h = 0;
 }
 
 void textboxclass::centerx()