Tweaks to handling data