Bug Fixes - Date formatting issue