fix some DateTime issues