more DateTime fixes