Fix breaking changes.