diff --git a/patterns_components/components/field.inc b/patterns_components/components/field.inc
index 94e8cfb..6dec44c 100644
--- a/patterns_components/components/field.inc
+++ b/patterns_components/components/field.inc
@@ -295,18 +295,16 @@ function field_patterns_cleanup($action, $tag, &$data) {
   return patterns_results();
 }
 
+
 function _field_patterns_prepare_instance($action, $data) {
-  $prefix = '';
-  if ($action == PATTERNS_DELETE || $action == PATTERNS_MODIFY) {
-    $prefix = 'field_';
-  }
+
   $existing_f  = '_add_existing_field';
   $new_f       = '_add_new_field';
 
   $all_fields = field_info_fields();
-  $existing = array_key_exists($prefix . $data['name'], $all_fields) ? $existing_f : $new_f;
+  $existing = array_key_exists($data['field_name'], $all_fields) ? $existing_f : $new_f;
   $data['fields'] = array();
-  $fname = $prefix . $data['name'];
+  $fname = $data['field_name'];
 
   // Setting default values which can be overriden later
 
@@ -319,7 +317,8 @@ function _field_patterns_prepare_instance($action, $data) {
   if ($action == PATTERNS_CREATE) {
     // NAME
     $data['fields'][$existing]['field_name'] = $fname;
-    unset($data['name']);
+   // unset($data['name']);
+
     // LABEL
     if (isset($data['label'])) {
       $data['fields'][$existing]['label'] = $data['label'];
diff --git a/patterns_components/components/node.inc b/patterns_components/components/node.inc
index 67729b1..5a9500b 100644
--- a/patterns_components/components/node.inc
+++ b/patterns_components/components/node.inc
@@ -111,7 +111,7 @@ function node_patterns_get_arguments($action, $tag, $form_id, &$loop = FALSE) {
 function node_patterns_prepare($action, $tag, &$data) {
   if ($tag == 'content_type') {
     if ($action === PATTERNS_CREATE or $action === PATTERNS_MODIFY) {
-      if ($data['node_options']) {
+      if (isset($data['node_options'])) {
         $data['node_options'] = array_values($data['node_options']);
       }
       else {