Fixed failing changesets on CI

Fixed failing changesets