Tweaks to get dateranges to save again