diff --git a/backend/gif.c b/backend/gif.c
index ab55cad9..757242f6 100644
--- a/backend/gif.c
+++ b/backend/gif.c
@@ -286,8 +286,8 @@ int gif_pixel_plot(struct zint_symbol *symbol, int image_height, int image_width
     int errno;
     int row, column;
     FILE *gif_file;
-	unsigned short ImageWidth;
-	unsigned short ImageHeight;
+	unsigned short ImageWidth = image_width;
+	unsigned short ImageHeight = image_height;
 	unsigned short usTemp;
     int byte_out;
 #ifdef _MSC_VER
@@ -306,8 +306,6 @@ int gif_pixel_plot(struct zint_symbol *symbol, int image_height, int image_width
     switch (rotate_angle) {
         case 0:
         case 180:
-            ImageWidth = image_width;
-            ImageHeight = image_height;
             symbol->bitmap_width = image_width;
             symbol->bitmap_height = image_height;
             break;
diff --git a/backend/hanxin.c b/backend/hanxin.c
index 9c563479..89c02f5b 100644
--- a/backend/hanxin.c
+++ b/backend/hanxin.c
@@ -1302,7 +1302,7 @@ int han_xin(struct zint_symbol *symbol, const unsigned char source[], int length
     int est_binlen;
     int ecc_level = symbol->option_1;
     int i, j, version, posn = 0, glyph, glyph2;
-    int data_codewords, size;
+    int data_codewords = 0, size;
     int est_codewords;
     int bitmask;
     int error_number;