Fixes for future breaking changes.