latest corrections for Dart updates