Fix date convertions