Updates for Dart 1.6