Some fixes to dates