diff --git a/src/ATC/ATCdisplay.hxx b/src/ATC/ATCdisplay.hxx
index 952d1eb38..5667a9d16 100644
--- a/src/ATC/ATCdisplay.hxx
+++ b/src/ATC/ATCdisplay.hxx
@@ -32,7 +32,6 @@
 
 SG_USING_STD(vector);
 SG_USING_STD(string);
-SG_USING_NAMESPACE(std);
 
 struct atcMessage {
     string msg;
@@ -42,7 +41,7 @@ struct atcMessage {
 
 // ASSUMPTION - with two radios the list won't be long so we don't need to map the id's
 typedef vector<atcMessage> atcMessageList;
-typedef vector<atcMessage>::iterator atcMessageListIterator;
+typedef atcMessageList::iterator atcMessageListIterator;
 
 class FGATCDisplay {
 
diff --git a/src/Scenery/newcache.cxx b/src/Scenery/newcache.cxx
index 8c0ebdb3c..aca6fe0a0 100644
--- a/src/Scenery/newcache.cxx
+++ b/src/Scenery/newcache.cxx
@@ -173,6 +173,10 @@ bool FGNewCache::make_space() {
 	    return false;
 	}
     }
+
+    SG_LOG( SG_TERRAIN, SG_ALERT, "WHOOPS!!! Hit an unhandled condition in  "
+            "FGNewCache::make_space()." );
+    return false;
 }