util: adapt to clear interface changes