diff --git a/applications/codec/convert.c b/applications/codec/convert.c
index d926d4eb..d999bca7 100644
--- a/applications/codec/convert.c
+++ b/applications/codec/convert.c
@@ -830,7 +830,7 @@ opj_image_t* bmptoimage(const char *filename, opj_cparameters_t *parameters)
 	int *green = image->comps[1].data;
 	int *blue = image->comps[2].data;
 	unsigned int offset = File_h.bfOffBits;
-	unsigned int line;
+	int line;
 
 	/* set image data */
 	for(line = 0; line < h; ++line)
diff --git a/tests/unit/testempty2.c b/tests/unit/testempty2.c
index 7d1ed683..f6eac7b9 100644
--- a/tests/unit/testempty2.c
+++ b/tests/unit/testempty2.c
@@ -63,8 +63,8 @@ int main(int argc, char *argv[])
 
   opj_cparameters_t parameters;
 
-  int subsampling_dx = parameters.subsampling_dx;
-  int subsampling_dy = parameters.subsampling_dy;
+  int subsampling_dx;
+  int subsampling_dy;
   const char outputfile[] = "testempty2.j2k";
 
   opj_image_cmptparm_t cmptparm;
@@ -81,6 +81,8 @@ int main(int argc, char *argv[])
   opj_set_default_encoder_parameters(&parameters);
   parameters.cod_format = J2K_CFMT;
   puts(v);
+  subsampling_dx = parameters.subsampling_dx;
+  subsampling_dy = parameters.subsampling_dy;
   cmptparm.prec = 8;
   cmptparm.bpp = 8;
   cmptparm.sgnd = 0;