Minor fixes to accomodate Dart-SDK and library update.