Changes to fix API.