Fixed dart breaking changes