diff --git a/examples/tap/tap-csma-virtual-machine.cc b/examples/tap/tap-csma-virtual-machine.cc
index ff9216d5d..5ec42c624 100644
--- a/examples/tap/tap-csma-virtual-machine.cc
+++ b/examples/tap/tap-csma-virtual-machine.cc
@@ -87,7 +87,7 @@ main (int argc, char *argv[])
   nodes.Create (2);
 
   CsmaHelper csma;
-  csma.SetChannelAttribute ("DataRate", DataRateValue (5000000));
+  csma.SetChannelAttribute ("DataRate", DataRateValue (10000000));
   csma.SetChannelAttribute ("Delay", TimeValue (MilliSeconds (2)));
 
   NetDeviceContainer devices = csma.Install (nodes);
@@ -96,7 +96,7 @@ main (int argc, char *argv[])
   stack.Install (nodes);
 
   Ipv4AddressHelper addresses;
-  addresses.SetBase ("10.0.2.0", "255.255.255.0", "0.0.0.100");
+  addresses.SetBase ("10.0.0.0", "255.255.255.0");
   Ipv4InterfaceContainer interfaces = addresses.Assign (devices);
 
   TapBridgeHelper tapBridge;
diff --git a/src/contrib/display-functions.h b/src/contrib/display-functions.h
index c8a915d2d..bb89f6b8a 100644
--- a/src/contrib/display-functions.h
+++ b/src/contrib/display-functions.h
@@ -147,4 +147,4 @@ clean_model_callback_config_default (GtkTreeModel *model, GtkTreePath *path,
                                      GtkTreeIter *iter, gpointer data);
 }//end namespace ns3
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/contrib/model-node-creator.cc b/src/contrib/model-node-creator.cc
index 3081c831e..0b5a3d245 100644
--- a/src/contrib/model-node-creator.cc
+++ b/src/contrib/model-node-creator.cc
@@ -127,4 +127,4 @@ ModelCreator::DoEndVisitArrayItem (void)
   g_free (iter);
   m_iters.pop_back ();  
 }
-}//end namespace ns3
\ No newline at end of file
+}//end namespace ns3
diff --git a/src/contrib/model-node-creator.h b/src/contrib/model-node-creator.h
index bce4ed4db..f2947797d 100644
--- a/src/contrib/model-node-creator.h
+++ b/src/contrib/model-node-creator.h
@@ -70,4 +70,4 @@ private:
   GtkTreeStore *m_treestore;
   std::vector<GtkTreeIter *> m_iters;
 };
-}
\ No newline at end of file
+}
diff --git a/src/contrib/model-typeid-creator.cc b/src/contrib/model-typeid-creator.cc
index e26fc1689..e6a2478ca 100644
--- a/src/contrib/model-typeid-creator.cc
+++ b/src/contrib/model-typeid-creator.cc
@@ -78,4 +78,4 @@ ModelTypeidCreator::EndVisitTypeId (void)
 {
   Remove ();
 }
-}//end namespace ns3
\ No newline at end of file
+}//end namespace ns3
diff --git a/src/contrib/model-typeid-creator.h b/src/contrib/model-typeid-creator.h
index 299a82737..63cc2c207 100644
--- a/src/contrib/model-typeid-creator.h
+++ b/src/contrib/model-typeid-creator.h
@@ -79,4 +79,4 @@ private:
   //This contains a vector of iterators used to build the TreeStore
   std::vector<GtkTreeIter *> m_iters;
 };
-}
\ No newline at end of file
+}