Fix EmptyDate require
Fix Drupal helper