Fix breaking changes