More tweaks on date