Fixes some problems with the new interface.