cell: fix breakage from xlib re-org

Some of these fixes are quick band-aids for now.
5 files changed