trace: adapt to interface changes