diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index 600379b14f6..bfd84730bf4 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -192,6 +192,9 @@ ThemeEngine::ThemeEngine(Common::String id, GraphicsMode mode) :
 	_font(nullptr), _initOk(false), _themeOk(false), _enabled(false), _themeFiles(),
 	_cursor(nullptr), _scaleFactor(1.0f) {
 
+	_baseWidth = 640;	// Default sane values
+	_baseHeight = 480;
+
 	_system = g_system;
 	_parser = new ThemeParser(this);
 	_themeEval = new GUI::ThemeEval();
@@ -227,9 +230,9 @@ ThemeEngine::ThemeEngine(Common::String id, GraphicsMode mode) :
 
 	_cursorHotspotX = _cursorHotspotY = 0;
 	_cursorWidth = _cursorHeight = 0;
+	_cursorTransparent = 255;
 #ifndef USE_RGB_COLOR
 	_cursorFormat = Graphics::PixelFormat::createFormatCLUT8();
-	_cursorTransparent = 255;
 	_cursorPalSize = 0;
 #endif
 
diff --git a/gui/Tooltip.cpp b/gui/Tooltip.cpp
index 20f74e1cd0c..761257f82f5 100644
--- a/gui/Tooltip.cpp
+++ b/gui/Tooltip.cpp
@@ -32,7 +32,7 @@ namespace GUI {
 
 
 Tooltip::Tooltip() :
-	Dialog(-1, -1, -1, -1), _maxWidth(-1), _parent(nullptr), _xdelta(0), _ydelta(0) {
+	Dialog(-1, -1, -1, -1), _maxWidth(-1), _parent(nullptr), _xdelta(0), _ydelta(0), _xpadding(0), _ypadding(0) {
 
 	_backgroundType = GUI::ThemeEngine::kDialogBackgroundTooltip;
 }