diff --git a/redo/box.c b/redo/box.c
index 4737774f..e44ad8d7 100644
--- a/redo/box.c
+++ b/redo/box.c
@@ -203,6 +203,7 @@ static void boxResize(uiControl *c, intmax_t x, intmax_t y, intmax_t width, intm
 	uiFreeSizing(dchild);
 }
 
+// TODO this doesn't really work the way we want for Z-orders
 static void boxSysFunc(uiControl *c, uiControlSysFuncParams *p)
 {
 	struct box *b = (struct box *) c;
@@ -263,8 +264,7 @@ uiBox *uiNewHorizontalBox(void)
 {
 	struct box *b;
 
-	b = uiNew(struct box);
-	uiTyped(b)->Type = uiTypeBox();
+	b = (struct box *) uiNewControl(uiTypeBox());
 
 	b->handle = uiMakeContainer(uiControl(b));
 
diff --git a/redo/windows/radiobuttons.c b/redo/windows/radiobuttons.c
index 3dd6f391..947b50cb 100644
--- a/redo/windows/radiobuttons.c
+++ b/redo/windows/radiobuttons.c
@@ -148,8 +148,7 @@ uiRadioButtons *uiNewRadioButtons(void)
 {
 	struct radiobuttons *r;
 
-	r = uiNew(struct radiobuttons);
-	uiTyped(r)->Type = uiTypeRadioButtons();
+	r = (struct radiobuttons *) uiNewControl(uiTypeRadioButtons());
 
 	r->hwnds = newPtrArray();
 
diff --git a/redo/windows/window.c b/redo/windows/window.c
index 251d755e..06304f92 100644
--- a/redo/windows/window.c
+++ b/redo/windows/window.c
@@ -145,8 +145,8 @@ static uiSizing *windowSizing(uiControl *c)
 
 static int windowContainerVisible(uiControl *c)
 {
-	complain("attempt to get container visibility state of uiWindow %p", c);
-	return 0;			// make compiler happy
+	// TODO
+	return 1;
 }
 
 static void windowShow(uiControl *c)
@@ -358,6 +358,8 @@ uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar)
 	uiControl(w)->ContainerVisible = windowContainerVisible;
 	uiControl(w)->Show = windowShow;
 	uiControl(w)->Hide = windowHide;
+	// TODO
+	uiControl(w)->ContainerEnabled = windowContainerVisible;
 	uiControl(w)->Enable = windowEnable;
 	uiControl(w)->Disable = windowDisable;
 	uiControl(w)->SysFunc = windowSysFunc;