Fixed issues with new dart library.