fix latest dart changes