fixes for date