fixes for Dates