--- a/properties.h
+++ b/properties.h
@@ -33,9 +33,7 @@
 #include <map>
 #include <string>
 
-#ifdef WIN32
 using namespace std;
-#endif
 
 #include "defs.h"
 
--- a/anim.h
+++ b/anim.h
@@ -27,9 +27,7 @@
 // Language Includes
 #include <list>
 
-#ifdef WIN32
 using namespace std;
-#endif
 
 // Application Includes
 #include "graph.h"
--- a/exception.h
+++ b/exception.h
@@ -27,10 +27,9 @@
 
 // Language Includes
 #include <string>
+#include <iostream>
 
-#ifdef WIN32
 using namespace std;
-#endif
 
 #define CatchEx(aEx)		catch( CXLException aEx )
 #define ThrowEx(aError)		throw CXLException(aError,__FILE__,__LINE__)
--- a/gamelogic.cpp
+++ b/gamelogic.cpp
@@ -154,7 +154,7 @@
 		levelFile = NULL;
 	}
 
-	currentMap = NULL;
+	currentMap = gameLevels.begin();
 
 	playerName = new char[32+1];
 	strcpy( playerName, "nobody" );