diff --git a/includes/modules/user.inc b/includes/modules/user.inc
index 7ec3d19..db38ac0 100644
--- a/includes/modules/user.inc
+++ b/includes/modules/user.inc
@@ -17,6 +17,9 @@ function user_uuid_node_features_export_render_alter(&$export, &$node, $module)
   // Ensure we don't export the name or uid property which could lead to a user
   // override due to the handling in node_submit().
   unset($export->name);
+
+  // Remove other properties handled solely by user module.
+  unset($export->data, $export->picture);
 }
 
 /**
diff --git a/includes/uuid_field_collection.features.inc b/includes/uuid_field_collection.features.inc
index f1c7953..9bdcd63 100644
--- a/includes/uuid_field_collection.features.inc
+++ b/includes/uuid_field_collection.features.inc
@@ -12,8 +12,13 @@ function uuid_field_collection_features_export_options() {
 
   $all_ids = array();
 
+  // Only allow enabled bundles to be exported.
+  $enabled_bundles = variable_get('uuid_features_entity_field_collection_item', array());
+  $enabled_bundles = array_filter($enabled_bundles);
+
   $efq_field_collection_items = new EntityFieldQuery();
   $efq_field_collection_items->entityCondition('entity_type', 'field_collection_item');
+  $efq_field_collection_items->entityCondition('bundle', $enabled_bundles);
   $result = $efq_field_collection_items->execute();
 
   if (!empty($result['field_collection_item'])) {
diff --git a/includes/uuid_node.features.inc b/includes/uuid_node.features.inc
index 60964f1..e5a63bc 100755
--- a/includes/uuid_node.features.inc
+++ b/includes/uuid_node.features.inc
@@ -11,8 +11,17 @@ function uuid_node_features_export_options() {
   $options = array();
   $types = node_type_get_names();
 
-  $query = 'SELECT n.nid, n.title, n.type, n.uuid FROM {node} n ORDER BY n.type, n.title ASC';
-  $results = db_query($query);
+  // Only allow enabled bundles to be exported.
+  $enabled_bundles = variable_get('uuid_features_entity_node', array());
+  $enabled_bundles = array_filter($enabled_bundles);
+
+  $query = db_select('node')
+    ->fields('node', array('nid', 'title', 'type', 'uuid'))
+    ->orderBy('type')
+    ->orderBy('title')
+    ->condition('type', $enabled_bundles);
+
+  $results = $query->execute();
   foreach ($results as $node) {
     $options[$node->uuid] = t('@type: @title',
       array(
@@ -105,6 +114,7 @@ function uuid_node_features_export_render($module, $data) {
     unset($export->last_comment_timestamp);
     unset($export->last_comment_id);
     unset($export->last_comment_name);
+    unset($export->last_comment_uid);
     unset($export->cid);
 
     $code[] = '  $nodes[] = ' . features_var_export($export) . ';';
diff --git a/includes/uuid_term.features.inc b/includes/uuid_term.features.inc
index 1ad81f8..ddf27c2 100644
--- a/includes/uuid_term.features.inc
+++ b/includes/uuid_term.features.inc
@@ -10,7 +10,7 @@
 function uuid_term_features_export_options() {
   $options = array();
   // Could just leave this empty.
-  $vocabs = variable_get('uuid_features_entity_taxonomy_term_vocabularies', array_fill_keys(array_keys(taxonomy_vocabulary_get_names()), 0));
+  $vocabs = variable_get('uuid_features_entity_taxonomy_term', array_fill_keys(array_keys(taxonomy_vocabulary_get_names()), 0));
   // Only include vocabs that user has selected (ie. set a non zero value).
   $vocabs = array_filter($vocabs);
   if (empty($vocabs)) {