fix more API change fallout in recently merged upstream changes.
Signed-off-by: NIngo Molnar <mingo@elte.hu>