Minor tweaks to orgunit_box