More robust handling of cells that contain dates