Fixed broken dart-1.0 changes