Fix more problems with dates