diff --git a/channels/rdpdr/disk/disk_file.c b/channels/rdpdr/disk/disk_file.c
index 52b7bd839..741bea190 100644
--- a/channels/rdpdr/disk/disk_file.c
+++ b/channels/rdpdr/disk/disk_file.c
@@ -84,7 +84,7 @@ static boolean disk_file_remove_dir(const char* path)
 	struct dirent* pdirent;
 	struct stat st;
 	char* p;
-	boolean ret;
+	boolean ret = True;
 
 	dir = opendir(path);
 	if (dir == NULL)
diff --git a/libfreerdp-core/orders.c b/libfreerdp-core/orders.c
index a15214240..53a4247aa 100644
--- a/libfreerdp-core/orders.c
+++ b/libfreerdp-core/orders.c
@@ -326,7 +326,7 @@ void update_read_brush(STREAM* s, BRUSH* brush, uint8 fieldFlags)
 void update_read_delta_rects(STREAM* s, DELTA_RECT* rectangles, int number)
 {
 	int i;
-	uint8 flags;
+	uint8 flags = 0;
 	uint8* zeroBits;
 	int zeroBitsSize;
 
@@ -371,7 +371,7 @@ void update_read_delta_rects(STREAM* s, DELTA_RECT* rectangles, int number)
 void update_read_delta_points(STREAM* s, DELTA_POINT* points, int number, sint16 x, sint16 y)
 {
 	int i;
-	uint8 flags;
+	uint8 flags = 0;
 	uint8* zeroBits;
 	int zeroBitsSize;
 
@@ -1346,7 +1346,7 @@ void update_decompress_brush(STREAM* s, uint8* output, uint8 bpp)
 {
 	int index;
 	int x, y, k;
-	uint8 byte;
+	uint8 byte = 0;
 	uint8* palette;
 
 	palette = s->p + 16;
diff --git a/libfreerdp-gdi/gdi.c b/libfreerdp-gdi/gdi.c
index 5a048d1b3..615ae8745 100644
--- a/libfreerdp-gdi/gdi.c
+++ b/libfreerdp-gdi/gdi.c
@@ -601,9 +601,9 @@ void gdi_multi_opaque_rect(rdpUpdate* update, MULTI_OPAQUE_RECT_ORDER* multi_opa
 
 		hBrush = gdi_CreateSolidBrush(brush_color);
 		gdi_FillRect(gdi->drawing->hdc, &rect, hBrush);
-	}
 
-	gdi_DeleteObject((HGDIOBJECT) hBrush);
+		gdi_DeleteObject((HGDIOBJECT) hBrush);
+	}
 }
 
 void gdi_line_to(rdpUpdate* update, LINE_TO_ORDER* line_to)