Tweaks to the dart code