Fixing date fields