Bug fixes #2 (Date formatting)