diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index aa9f37aa2..b2b862fba 100644
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -71,7 +71,7 @@ FGGlobals::FGGlobals() :
     acmodel( NULL ),
     model_mgr( NULL ),
     channel_options_list( NULL ),
-    initial_waypoints(0),
+    initial_waypoints( NULL ),
     scenery( NULL ),
     tile_mgr( NULL ),
     io( new FGIO ),
diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index 1446e0921..3077e750e 100644
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -97,8 +97,8 @@ class FGGlobals
 
 private:
 
-    SGSubsystemMgr * subsystem_mgr;
-    SGEventMgr * event_mgr;
+    SGSubsystemMgr *subsystem_mgr;
+    SGEventMgr *event_mgr;
 
     // Number of milliseconds elapsed since the start of the program.
     double sim_time_sec;
@@ -217,9 +217,9 @@ public:
     FGGlobals();
     virtual ~FGGlobals();
 
-    virtual SGSubsystemMgr * get_subsystem_mgr () const;
+    virtual SGSubsystemMgr *get_subsystem_mgr () const;
 
-    virtual SGSubsystem * get_subsystem (const char * name);
+    virtual SGSubsystem *get_subsystem (const char * name);
 
     virtual void add_subsystem (const char * name,
                                 SGSubsystem * subsystem,
@@ -227,7 +227,7 @@ public:
                                 type = SGSubsystemMgr::GENERAL,
                                 double min_time_sec = 0);
 
-    virtual SGEventMgr * get_event_mgr () const;
+    virtual SGEventMgr *get_event_mgr () const;
 
     inline double get_sim_time_sec () const { return sim_time_sec; }
     inline void inc_sim_time_sec (double dt) { sim_time_sec += dt; }