Changes for Dart V1.5, nothing functional, testing only