diff --git a/ChangeLog b/ChangeLog
index 9768f4227e310942ab96c38209634f2d632a99dc..6d2e864200c02585c45bff3cc54f2782616fae63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-08  Andrea Bulgarelli <bulgarelli@iasfbo.inaf.it>
+
+* src/PartOfPacket.cpp (PartOfPacket::loadFields): inserted do-while
+* src/PacketHeader.cpp (PacketHeader::~PacketHeader): removed delete name
+
 2013-09-19  Andrea Bulgarelli <bulgarelli@iasfbo.inaf.it>
 
 * src/Packet.cpp (Packet::setPacketValue): bug correction
diff --git a/Makefile b/Makefile
index ec0a4a4c65cb74d2b6aa993b5e4db5d3e942712c..01a571b77eecf868279b5165f37b9fd92942745a 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,7 @@ ifeq ($(SYSTEM), QNX)
 endif
 ifneq (, $(findstring apple, $(SYSTEM)))
  	# Do apple things
-	CPPFLAGS += -I$(LOCAL)/include/cppunit
+	CPPFLAGS += -I$(LOCAL)/include
 	LIBS += -L$(LOCAL)/lib
 endif 
 
diff --git a/src/Packet.cpp b/src/Packet.cpp
index 35be4d2af2e3ac2feaa0e23d104279abb6ca055f..2b1379571980c82b20413de2aebb0ce6f38a6858 100644
--- a/src/Packet.cpp
+++ b/src/Packet.cpp
@@ -54,8 +54,6 @@ Packet::~Packet()
     header = 0;
     delete dataField;
     dataField = 0;
-    delete[] name;
-    name = 0;
     for(unsigned i = 0; i < number_of_identifier; i++)
         delete identifiers[i];
     delete[] identifiers;
@@ -65,7 +63,7 @@ Packet::~Packet()
     tempHeader = 0;
     delete tempDataField;
     tempDataField = 0;
-    //ANDREA: ricordato di indagare perch�non si riesce ad effettuare il delete
+    //ANDREA: ricordato di indagare perche' non si riesce ad effettuare il delete
     delete tempDataFieldHeader;
     tempDataFieldHeader = 0;
     delete tempPacketDataField;
diff --git a/src/PacketHeader.cpp b/src/PacketHeader.cpp
index 5266a40e7f35b0dd55c0fb016d1da73aeb6758dd..7a5d9a8fbf588d3e8185158c672018afcaa5e443 100644
--- a/src/PacketHeader.cpp
+++ b/src/PacketHeader.cpp
@@ -31,7 +31,7 @@ PacketHeader::PacketHeader() : PartOfPacket("Packet Header")
 
 PacketHeader::~PacketHeader()
 {
-    delete[] name;
+
 }
 
 
diff --git a/src/PartOfPacket.cpp b/src/PartOfPacket.cpp
index 4d16343d395cb98293fbc928f39f207e92546b73..e2db0684be4985ca57e3b2b96d07db99243c9cfa 100644
--- a/src/PartOfPacket.cpp
+++ b/src/PartOfPacket.cpp
@@ -90,10 +90,7 @@ bool PartOfPacket::loadFields(InputText& fp) throw(PacketException*)
     int count = 0;
     /// count the number of fields
     long pos = fp.getpos();
-    name = fp.getLine();
-    count++;
-    while(strlen(name) !=  0)
-    {
+    do {
         name = fp.getLine();
         count++;
         if(name[0] == '[')
@@ -101,7 +98,7 @@ bool PartOfPacket::loadFields(InputText& fp) throw(PacketException*)
             count--;
             break;
         }
-    }
+    } while(strlen(name) !=  0);
     fp.setpos(pos);
     fields = new Field* [count/3];