adapt to baselib changes