diff --git a/src/gui/components/cc_draw.cpp b/src/gui/components/cc_draw.cpp
index 5c4d8448b..dff34aad1 100644
--- a/src/gui/components/cc_draw.cpp
+++ b/src/gui/components/cc_draw.cpp
@@ -49,7 +49,7 @@ CCDraw::CCDraw() : COSDFader(g_settings.theme.menu_Content_alpha)
 
 	fr_thickness = fr_thickness_old		= 0;
 
-	corner_type = corner_type_old		= CORNER_ALL;
+	corner_type = corner_type_old		= CORNER_NONE;
 	corner_rad = corner_rad_old		= 0;
 
 	shadow			= CC_SHADOW_OFF;
@@ -552,7 +552,7 @@ void CCDraw::paintFbItems(bool do_save_bg)
 		}
 		if (paint_bg){
 			if (fbtype == CC_FBDATA_TYPE_BACKGROUND){
-				frameBuffer->paintBackgroundBoxRel(x, y, fbdata.dx, fbdata.dy);
+				frameBuffer->paintBackgroundBoxRel(fbdata.x, fbdata.y, fbdata.dx, fbdata.dy);
 				v_fbdata[i].is_painted = true;
 			}
 		}
diff --git a/src/gui/components/cc_item_shapes.cpp b/src/gui/components/cc_item_shapes.cpp
index dffaca928..9b55d0580 100644
--- a/src/gui/components/cc_item_shapes.cpp
+++ b/src/gui/components/cc_item_shapes.cpp
@@ -74,6 +74,9 @@ CComponentsShapeCircle::CComponentsShapeCircle(	int x_pos, int y_pos, int diam,
 	//CComponents
 	x 		= x_pos;
 	y 		= y_pos;
+
+	corner_type = corner_type_old		= CORNER_ALL;
+
 	//width = height	= d = diam;
 	shadow		= shadow_mode;
 	shadow_w	= OFFSET_SHADOW;