[bugfix] Some fixes for date