Fixes to dart 19425

Unit tests start failing in dependencies without these updates.