fixes for latest Dart SDK