diff --git a/includes/date.inc b/includes/date.inc
index 8b5bd34..9491e75 100644
--- a/includes/date.inc
+++ b/includes/date.inc
@@ -109,10 +109,10 @@ function signup_content_type_fields() {
  */
 function _signup_date_get_node_scheduler($node) {
   $field = signup_date_field($node->type);
-  if (!empty($node->{$field['field_name']}[$node->language][0]['value'])) {
+  if (isset($node->{$field['field_name'] . '_value'})) {
     return 'date';
   }
-  if (isset($node->{$field['field_name'] . '_value'})) {
+  if (!empty($node->{$field['field_name']}[$node->language][0]['value'])) {
     return 'date';
   }
   return 'none';
@@ -325,7 +325,7 @@ function _signup_date_reminder_sql($content_type) {
   $start_field = $field['field_name'] . '_value';
 
   // Figure out what TZ we want to do the date comparisons in.
-  $compare_tz = $field['settings']['tz_handling'] == 'none' ? date_default_timezone_name() : 'UTC';
+  $compare_tz = $field['settings']['tz_handling'] == 'none' ? date_default_timezone() : 'UTC';
   // Get a DateAPI SQL handler class for this field.
   $handler = date_field_get_sql_handler($field, $compare_tz);
 
@@ -373,7 +373,7 @@ function _signup_date_autoclose_sql($content_type) {
   $start_field = $field['field_name'] . '_value';
 
   // Figure out what TZ we want to do the date comparisons in.
-  $compare_tz = $field['settings']['tz_handling'] == 'none' ? date_default_timezone_name() : 'UTC';
+  $compare_tz = $field['settings']['tz_handling'] == 'none' ? date_default_timezone() : 'UTC';
   // Get a DateAPI SQL handler class for this field.
   $handler = date_field_get_sql_handler($field, $compare_tz);
 
@@ -469,7 +469,7 @@ function _signup_date_format_date($node, $include_to_date = FALSE) {
   if ($db_tz != $display_tz) {
     $date->setTimezone(timezone_open($display_tz));
   }
-  $format = date_formatter_format('default', $field['field_name']);
+  $format = date_formatter_format('default', $field['field_name'], $field['settings']['granularity']);
   $date_out = $date->format($format);
 
   if ($include_to_date) {