Minor cleanup for dates