Fix Date

Fixing date problems