diff --git a/container_unix.c b/container_unix.c
index ab0298f8..d961d020 100644
--- a/container_unix.c
+++ b/container_unix.c
@@ -39,7 +39,7 @@ static void uiContainer_size_allocate(GtkWidget *widget, GtkAllocation *allocati
 
 	gtk_widget_set_allocation(widget, allocation);
 	c = uiContainer(widget)->child;
-	(*(c->resize))(widget, allocation.x, allocation.y, allocation.width, allocation.height, &d);
+	(*(c->resize))(c, allocation->x, allocation->y, allocation->width, allocation->height, &d);
 }
 
 struct forall {
@@ -51,7 +51,7 @@ static void doforall(gpointer obj, gpointer data)
 {
 	struct forall *s = (struct forall *) data;
 
-	(*(s->callback))(uiContainer(obj), s->data);
+	(*(s->callback))(GTK_WIDGET(obj), s->data);
 }
 
 static void uiContainer_forall(GtkContainer *container, gboolean includeInternals, GtkCallback callback, gpointer data)
diff --git a/newcontrol_unix.c b/newcontrol_unix.c
index dd4e4ebd..0523bd3b 100644
--- a/newcontrol_unix.c
+++ b/newcontrol_unix.c
@@ -62,9 +62,9 @@ static void singleContainerHide(uiControl *c)
 
 uiControl *uiUnixNewControl(GType type, guint nConstructParams, GParameter *constructParams, gboolean inScrolledWindow, gboolean needsViewport, gboolean scrolledWindowHasBorder, void *data)
 {
-	uiSingleHWNDControl *c;
+	uiSingleWidgetControl *c;
 
-	c = g_new0(uiSingleHWNDControl, 1);
+	c = g_new0(uiSingleWidgetControl, 1);
 	c->widget = GTK_WIDGET(g_object_newv(type, nConstructParams, constructParams));
 	c->immediate = c->widget;
 
diff --git a/uipriv_unix.h b/uipriv_unix.h
index 95b24688..1ee22694 100644
--- a/uipriv_unix.h
+++ b/uipriv_unix.h
@@ -7,6 +7,10 @@
 #include "uipriv.h"
 #include "ui_unix.h"
 
+// TODO move this to the right place
+struct uiSizing {
+};
+
 // container_unix.c
 #define uiContainerType (uiContainer_get_type())
 #define uiContainer(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), uiContainerType, uiContainer))