Fix Date parse issues