Fixes for Dart SDK updates.