Updates for recent Dart SDK