fixes for dates