Tweaks to data scripts