Tweaks to clean up imported data