diff --git a/handlers/xml_views_handler_field.inc b/handlers/xml_views_handler_field.inc
index 17a6db2..e11da5f 100644
--- a/handlers/xml_views_handler_field.inc
+++ b/handlers/xml_views_handler_field.inc
@@ -6,7 +6,7 @@ class xml_views_handler_field extends views_handler_field {
     return check_plain($values[$this->field_alias]);
   }
 
-  function element_type() {
+  function element_type($none_supported = FALSE, $default_empty = FALSE, $inline = FALSE) {
     if (isset($this->definition['element type'])) {
       return $this->definition['element type'];
     }
@@ -35,6 +35,7 @@ class xml_views_handler_field extends views_handler_field {
    * Called to add the field to a query.
    */
   function query() {
+    $this->table_alias = 'xml';
     // Add the field.
     $this->field_alias = $this->query->add_field($this->table_alias, $this->options['xpath_selector']);
   }
diff --git a/xml_views.info b/xml_views.info
index c4dbd35..0088b68 100644
--- a/xml_views.info
+++ b/xml_views.info
@@ -3,4 +3,12 @@ name = XML Views
 description = Adds a views backend to query XML files.
 package = Views
 dependencies[] = views
-core = 6.x
\ No newline at end of file
+core = 7.x
+files[] = xml_views_plugin_query_xml.inc
+files[] = xml_views.views.inc
+files[] = xml_views.views.module
+files[] =  handlers/xml_views_handler_argument_column.inc
+files[] =  handlers/xml_views_handler_argument.inc
+files[] =  handlers/xml_views_handler_field.inc
+files[] =  handlers/xml_views_handler_filter.inc
+files[] =  handlers/xml_views_handler_sort.inc
diff --git a/xml_views_plugin_query_xml.inc b/xml_views_plugin_query_xml.inc
index 74a699b..c2cef0b 100644
--- a/xml_views_plugin_query_xml.inc
+++ b/xml_views_plugin_query_xml.inc
@@ -6,7 +6,7 @@ class xml_views_plugin_query_xml extends views_plugin_query {
   /**
    * Constructor; Create the basic query object and fill with default values.
    */
-  function init($base_table = '', $base_field, $options) {
+  function init($base_table, $base_field, $options) {
     parent::init($base_table, $base_field, $options);
 
     $this->xml_file = $this->options['xml_file'];
@@ -24,8 +24,9 @@ class xml_views_plugin_query_xml extends views_plugin_query {
    * @param $get_count
    *   Provide a countquery if this is true, otherwise provide a normal query.
    */
-  function query($view, $get_count = FALSE) {
+  function query($get_count = FALSE) {
     $row_xpath = $this->options['row_xpath'];
+
     $filter_string = '';
     if (!empty($this->filter)) {
       $filters = array();
@@ -51,7 +52,14 @@ class xml_views_plugin_query_xml extends views_plugin_query {
   }
 
   function execute(&$view) {
-    $start = views_microtime();
+    $start = microtime();
+
+
+    // Take sure that always a xml file is in there.
+    // This could for example happen if you come from the add wizard to the actual views edit page.
+    if (empty($this->options['xml_file']) || empty($this->options['xml_file'])) {
+      return FALSE;
+    }
 
     $file = simplexml_load_file($this->options['xml_file']);
     $rows = $file->xpath($view->build_info['query']);
@@ -82,7 +90,7 @@ class xml_views_plugin_query_xml extends views_plugin_query {
     $view->result = $result;
     $view->total_rows = count($result);
 
-    $view->execute_time = views_microtime() - $start;
+    $view->execute_time = microtime() - $start;
   }
 
   function add_signature(&$view) {}