Fixes for new Dart build