diff --git a/mappers/date.inc b/mappers/date.inc
index ea57e27..4eb3aab 100644
--- a/mappers/date.inc
+++ b/mappers/date.inc
@@ -74,7 +74,9 @@ function date_feeds_set_target(FeedsSource $source, $entity, $target, array $val
       $field[LANGUAGE_NONE][$delta][$value_key] = '';
     }
     else {
-      $field[LANGUAGE_NONE][$delta]['timezone'] = $value->getTimezone()->getName();
+      if (!isset($field[LANGUAGE_NONE][$delta]['timezone'])) {
+        $field[LANGUAGE_NONE][$delta]['timezone'] = $value->getTimezone()->getName();
+      }
 
       $value->setTimezone($db_tz);
 
@@ -176,7 +178,7 @@ function _date_feeds_get_date_object($value, DateTimeZone $default_tz) {
   }
 
   // Filter out meaningless values.
-  if (empty($value) || !is_scalar($value)) {
+  if (empty($value) || !is_string($value) && !is_int($value)) {
     return FALSE;
   }
 
diff --git a/plugins/FeedsParser.inc b/plugins/FeedsParser.inc
index 1e1d329..781e417 100644
--- a/plugins/FeedsParser.inc
+++ b/plugins/FeedsParser.inc
@@ -484,6 +484,8 @@ class FeedsEnclosure extends FeedsElement {
 
 /**
  * Defines a date element of a parsed result (including ranges, repeat).
+ *
+ * @deprecated This is no longer in use and will not be maintained.
  */
 class FeedsDateTimeElement extends FeedsElement {
 
@@ -644,6 +646,8 @@ class FeedsDateTimeElement extends FeedsElement {
  * class.
  *
  * @see FeedsDateTimeElement
+ *
+ * @deprecated Use DateObject instead.
  */
 class FeedsDateTime extends DateTime {
   public $granularity = array();