Some date util rework