Fix date length issues