Fix last dart changes