changes to make the demo run with Dart SDK version 0.5.16.0_r23799