Fixed various breaking breaking changes with the new dart libraries