diff --git a/src/libs/tgf/tgf.hpp b/src/libs/tgf/tgf.hpp
index 3440459f1..c5898a7c7 100644
--- a/src/libs/tgf/tgf.hpp
+++ b/src/libs/tgf/tgf.hpp
@@ -264,6 +264,9 @@ class TGF_API GfApplication
 		bool bFound;
 		std::string strValue;
 	public:
+		Option()
+		{
+		}
 		Option(const std::string& strShortName_, const std::string& strLongName_,
 			   bool bHasValue_ = false)
 			: strShortName(strShortName_), strLongName(strLongName_), bHasValue(bHasValue_),
diff --git a/src/modules/userinterface/legacymenu/racescreens/driverselect.cpp b/src/modules/userinterface/legacymenu/racescreens/driverselect.cpp
index b479e6ff2..31f755a69 100644
--- a/src/modules/userinterface/legacymenu/racescreens/driverselect.cpp
+++ b/src/modules/userinterface/legacymenu/racescreens/driverselect.cpp
@@ -463,7 +463,7 @@ rmdsSelectDeselectDriver(void * /* dummy */ )
 {
     const char* name;
     int	src, dst;
-    GfDriver *pDriver;
+    GfDriver *pDriver = 0;
     bool bSelect;
 
     // If the selected driver is in the Candidate scroll-list,