Fix typo in dates
Fix scoping in Dates module