Adapt to new ojwidgets