Merge pull request #286 from dart-lang/fix-errors

Fix compilation errors