More slight interface changes.