A few tweaks to Dates