DateConversion fixes