fix two warnings
Merge pull request #108 from dart-gde/warnings

fix two warnings
fix some breaking changes
Merge pull request #110 from dart-gde/fix-stuff

fix some breaking changes