diff --git a/workspace/core/surface.cpp b/workspace/core/surface.cpp
index 06c4441..7971ba9 100644
--- a/workspace/core/surface.cpp
+++ b/workspace/core/surface.cpp
@@ -381,9 +381,6 @@ int c_surface::set_frame_layer_visible_rect(c_rect& rect, unsigned int z_order)
 	c_rect old_rect = m_frame_layers[z_order].visible_rect;
 	//Recover the lower layer
 	int src_zorder = (Z_ORDER_LEVEL)(z_order - 1);
-	int display_width = m_display->get_width();
-	int display_height = m_display->get_height();
-
 	for (int y = old_rect.m_top; y <= old_rect.m_bottom; y++)
 	{
 		for (int x = old_rect.m_left; x <= old_rect.m_right; x++)
diff --git a/workspace/widgets/dialog.cpp b/workspace/widgets/dialog.cpp
index 6b931ea..8fba397 100644
--- a/workspace/widgets/dialog.cpp
+++ b/workspace/widgets/dialog.cpp
@@ -112,10 +112,7 @@ int c_dialog::set_me_the_dialog()
 		if(ms_the_dialogs[i].surface == 0)
 		{
 			ms_the_dialogs[i].dialog = this;
-			if(this)
-			{
-				ms_the_dialogs[i].surface = surface;
-			}
+			ms_the_dialogs[i].surface = surface;
 			return 1;
 		}
 	}