diff --git a/CHANGES b/CHANGES
index 75a962fa..e7b18f2a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ What's New for OpenJPEG
 + : added
 
 October 11, 2011
+* [mickael] WIP: correct some segfault with win platform and remove a aligned allocation which produce error when a realloc is done on this pointer.
 * [mickael] WIP: add stream length value to read unknown marker size, backport 855 into V2 framework, correct memory leak into get_cstr_info
 * [mickael] WIP: add output elements about decoding of jp2 files with last tile part lenght equal zero
 * [mickael] WIP: correct mistake with JP2 files and manage correctly the text_GBR.jp2 filecase
diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c
index d29e060a..9263950f 100644
--- a/libopenjpeg/jp2.c
+++ b/libopenjpeg/jp2.c
@@ -2632,6 +2632,13 @@ opj_jp2_v2_t* jp2_create(opj_bool p_is_decoder)
 			return 00;
 		}
 
+		/* Color structure */
+		jp2->color.icc_profile_buf = NULL;
+		jp2->color.icc_profile_len = 0;
+		jp2->color.jp2_cdef = NULL;
+		jp2->color.jp2_pclr = NULL;
+		jp2->color.jp2_has_colr = 0;
+
 		// validation list creation
 		jp2->m_validation_list = opj_procedure_list_create();
 		if (! jp2->m_validation_list) {
diff --git a/libopenjpeg/tcd.c b/libopenjpeg/tcd.c
index e3a7dd32..06724c84 100644
--- a/libopenjpeg/tcd.c
+++ b/libopenjpeg/tcd.c
@@ -1714,7 +1714,7 @@ opj_bool FUNCTION (	opj_tcd_v2_t *p_tcd,										\
 		}																		\
 																				\
 		if (l_tilec->data == 00) {												\
-            l_tilec->data = (OPJ_INT32 *) opj_aligned_malloc(l_data_size);		\
+            l_tilec->data = (OPJ_INT32 *) opj_malloc(l_data_size);		\
 			if (! l_tilec->data ) {												\
 				return OPJ_FALSE;												\
 			}																	\
@@ -2301,7 +2301,7 @@ void tcd_free_tile(opj_tcd_v2_t *p_tcd)
 		}
 
 		if (l_tile_comp->data) {
-			opj_aligned_free(l_tile_comp->data);
+			opj_free(l_tile_comp->data);
 			l_tile_comp->data = 00;
 		}
 		++l_tile_comp;