diff --git a/lib/h5md/src/ch5md.c b/lib/h5md/src/ch5md.c
index ec1095a2d1..a9ad879ffa 100644
--- a/lib/h5md/src/ch5md.c
+++ b/lib/h5md/src/ch5md.c
@@ -131,7 +131,8 @@ hid_t h5md_open_file (const char *filename)
 h5md_particles_group h5md_create_particles_group(h5md_file file, const char *name)
 {
   h5md_particles_group group;
-  
+
+  memset(&group,0,sizeof(group));
   group.group = H5Gcreate(file.particles, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
   return group;
@@ -140,7 +141,7 @@ h5md_particles_group h5md_create_particles_group(h5md_file file, const char *nam
 hid_t h5md_open_particles_group(hid_t particles, const char *name)
 {
   hid_t group;
-  
+
   group = H5Gopen(particles, name, H5P_DEFAULT);
 
   return group;
@@ -156,6 +157,7 @@ h5md_element h5md_create_time_data(hid_t loc, const char *name, int rank, int in
 
   int i;
 
+  memset(&td,0,sizeof(td));
   dims[0] = 0 ;
   max_dims[0] = H5S_UNLIMITED ;
   for (i=0; i<rank; i++) {
@@ -215,7 +217,7 @@ int h5md_close_element(h5md_element e)
   H5Gclose(e.group);
 
   return 0;
-  
+
 }
 
 h5md_element h5md_create_fixed_data_simple(hid_t loc, const char *name, int rank, int int_dims[], hid_t datatype, void *data)
@@ -227,6 +229,7 @@ h5md_element h5md_create_fixed_data_simple(hid_t loc, const char *name, int rank
   hsize_t dims[H5S_MAX_RANK];
   int i;
 
+  memset(&fd,0,sizeof(fd));
   for (i=0; i<rank; i++) {
     dims[i] = int_dims[i];
   }
@@ -247,9 +250,9 @@ h5md_element h5md_create_fixed_data_scalar(hid_t loc, const char *name, hid_t da
 {
 
   h5md_element fd;
-
   hid_t spc;
 
+  memset(&fd,0,sizeof(fd));
   spc = H5Screate(H5S_SCALAR);
   fd.value = H5Dcreate(loc, name, datatype, spc, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
   H5Sclose(spc);
diff --git a/lib/poems/Makefile.g++ b/lib/poems/Makefile.g++
index 20d00a6034..54c897a22c 100644
--- a/lib/poems/Makefile.g++
+++ b/lib/poems/Makefile.g++
@@ -87,12 +87,10 @@ lib: 	$(OBJ)
 
 %.o:%.cpp
 	$(CC) $(CCFLAGS) -c $<
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(DEPFLAGS) $< > $@		
 
 # ------ DEPENDENCIES ------
 
-DEPENDS = $(OBJ:.o=.d)
+include .depend
 
 # ------ CLEAN ------
 
diff --git a/lib/poems/Makefile.icc b/lib/poems/Makefile.icc
index 8431f9b35c..49878d0ac8 100644
--- a/lib/poems/Makefile.icc
+++ b/lib/poems/Makefile.icc
@@ -87,12 +87,10 @@ lib: 	$(OBJ)
 
 %.o:%.cpp
 	$(CC) $(CCFLAGS) -c $<
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(DEPFLAGS) $< > $@		
 
 # ------ DEPENDENCIES ------
 
-DEPENDS = $(OBJ:.o=.d)
+include .depend
 
 # ------ CLEAN ------
 
diff --git a/lib/poems/Makefile.mingw32-cross b/lib/poems/Makefile.mingw32-cross
index 3a32f05955..17e81b51f0 100644
--- a/lib/poems/Makefile.mingw32-cross
+++ b/lib/poems/Makefile.mingw32-cross
@@ -97,12 +97,9 @@ $(LIB): $(OBJ)
 $(DIR)%.o:%.cpp
 	$(CC) $(CCFLAGS) -c $< -o $@
 
-$(DIR)%.d:%.cpp
-	$(CC) $(CCFLAGS) $(DEPFLAGS) $< > $@		
-
 # ------ DEPENDENCIES ------
 
-DEPENDS = $(OBJ:.o=.d)
+include .depend
 
 # ------ CLEAN ------
 
diff --git a/lib/poems/Makefile.mingw64-cross b/lib/poems/Makefile.mingw64-cross
index 4fcbe1d23a..2df43dea94 100644
--- a/lib/poems/Makefile.mingw64-cross
+++ b/lib/poems/Makefile.mingw64-cross
@@ -97,12 +97,9 @@ $(LIB): $(OBJ)
 $(DIR)%.o:%.cpp
 	$(CC) $(CCFLAGS) -c $< -o $@
 
-$(DIR)%.d:%.cpp
-	$(CC) $(CCFLAGS) $(DEPFLAGS) $< > $@		
-
 # ------ DEPENDENCIES ------
 
-DEPENDS = $(OBJ:.o=.d)
+include .depend
 
 # ------ CLEAN ------
 
diff --git a/lib/poems/system.cpp b/lib/poems/system.cpp
index 25e84c2b8c..c12d870269 100644
--- a/lib/poems/system.cpp
+++ b/lib/poems/system.cpp
@@ -378,8 +378,8 @@ void System::Create_DegenerateSystem(int& nfree, int*freelist, double *&masstota
 	  delete [] xh1[i];
 	  delete [] xh2[i];
   }
-  delete xh1;
-  delete xh2;  
+  delete [] xh1;
+  delete [] xh2;  
 }