diff --git a/modules/osf_configure/osf_configure.admin.inc b/modules/osf_configure/osf_configure.admin.inc
index 08c6ce9..4dcbaeb 100644
--- a/modules/osf_configure/osf_configure.admin.inc
+++ b/modules/osf_configure/osf_configure.admin.inc
@@ -82,7 +82,7 @@ function osf_configure_dataset_form(&$form, &$form_state) {
       '#title' => t('Role access'),
       '#description' => t('The role that will have full CRUD permissions on the new dataset you are about to create'),
       '#options' => $rolesOptions,
-      '#default_value' => $preset->role,
+      '#default_value' => (empty($preset->role) ? '' : $preset->role),
     ); 
   }
   
@@ -90,7 +90,7 @@ function osf_configure_dataset_form(&$form, &$form_state) {
     '#type' => 'checkbox',
     '#title' => t('Dataset is searchable'),
     '#description' => t('The dataset will be exposed to the OSF SearchAPI module by checking this option. If the dataset is not marked as <em>searchable</em>, it will be be of type <em>normal</em> which mean that it will be available to other modules.'),
-    '#default_value' => $preset->active,
+    '#default_value' => (empty($preset->active) ? '' : $preset->active),
   );    
 
   
diff --git a/modules/osf_configure/osf_configure.module b/modules/osf_configure/osf_configure.module
index 8f62de4..f15aff4 100644
--- a/modules/osf_configure/osf_configure.module
+++ b/modules/osf_configure/osf_configure.module
@@ -882,11 +882,12 @@ function osf_configure_osf_create_group($endpoint, $role_id, $role_name)
     if($authRegistrarGroup->error->id != 'WS-AUTH-REGISTRAR-GROUP-203')
     {
       drupal_set_message(
-        t('Couldn\'t create the new group in OSF. Error [%status] %msg (%msg_desc).',
+        t('Couldn\'t create the new group in OSF. Error [%status] %msg (%msg_desc). When this is the first login to this OSF instance, please make sure that on OSF the user "%userID" is added to the administrator group.',
           array(
             '%status' => $authRegistrarGroup->getStatus(),
             '%msg' => $authRegistrarGroup->getStatusMessage(),
             '%msg_desc' => $authRegistrarGroup->getStatusMessageDescription(),
+            '%userID' => osf_configure_get_first_user_uri(),
           )
         ),
         'error'
diff --git a/modules/osf_configure/plugins/export_ui/ctools_export_ui_osf_configure_datasets.class.php b/modules/osf_configure/plugins/export_ui/ctools_export_ui_osf_configure_datasets.class.php
index ffb4773..11c52d9 100644
--- a/modules/osf_configure/plugins/export_ui/ctools_export_ui_osf_configure_datasets.class.php
+++ b/modules/osf_configure/plugins/export_ui/ctools_export_ui_osf_configure_datasets.class.php
@@ -197,7 +197,7 @@ class ctools_export_ui_osf_configure_datasets extends ctools_export_ui {
 
     $this->rows[$name]['data']['origin'] = array('data' => $item->origin, 'class' => array('osf_configure-origin'));
 
-    global $OSF_CONFIGURE_DATASET_TYPES;
+    global $OSF_CONFIGURE_DATASET_TYPES, $base_url;
     $this->rows[$name]['data']['active'] = array('data' => $OSF_CONFIGURE_DATASET_TYPES[$item->active]);
 
     if (property_exists($item, 'available') && $item->available) {
@@ -220,7 +220,6 @@ class ctools_export_ui_osf_configure_datasets extends ctools_export_ui {
     }
     else
     {
-      global $base_url;
       $operations['add'] = array(
           'title' => t('Permissions'),
           'href' => $base_url.'/admin/people/permissions#edit-create-dataset-'.$item->scdid.'-'.$item->sceid
diff --git a/modules/osf_entities/osf_entities.admin.inc b/modules/osf_entities/osf_entities.admin.inc
index 438a7ba..e714eb6 100644
--- a/modules/osf_entities/osf_entities.admin.inc
+++ b/modules/osf_entities/osf_entities.admin.inc
@@ -1269,7 +1269,7 @@ function osf_entities_admin_content($form, $form_state)
          ->page($itemsPerPage * $page)
          ->extendedFilters($extendedSearch->getExtendedFilters())
          ->includeAggregates()         
-         ->sourceInterface(variable_get("osf_searchapi_settings_interface_name", ''))
+         ->sourceInterface(variable_get("osf_searchapi_settings_interface_name", 'default'))
          ->mime('resultset');
          
   if($showAvailable === TRUE)
diff --git a/modules/osf_entities/osf_entities.module b/modules/osf_entities/osf_entities.module
index e5b3381..8a97759 100644
--- a/modules/osf_entities/osf_entities.module
+++ b/modules/osf_entities/osf_entities.module
@@ -2877,7 +2877,7 @@ function osf_entities_resources_references_autocomplete($range, $query)
       $search->typeFilter($range);
     }
     
-    $search->sourceInterface(variable_get("osf_searchapi_settings_interface_name", ''))
+    $search->sourceInterface(variable_get("osf_searchapi_settings_interface_name", 'default'))
            ->send(new DrupalQuerierExtension());
     
     if(!$search->isSuccessful())
@@ -2973,7 +2973,7 @@ function osf_entities_resources_text_autocomplete($property, $query)
              ->attributeValuesFilters($property, '*'.$query.'**');
     }
     
-    $search->sourceInterface(variable_get("osf_searchapi_settings_interface_name", ''))
+    $search->sourceInterface(variable_get("osf_searchapi_settings_interface_name", 'default'))
            ->send(new DrupalQuerierExtension());
 
     if(!$search->isSuccessful())
@@ -3095,7 +3095,7 @@ function osf_entities_classes_autocomplete($mode, $query)
     }
            
     $search->typeFilter(Namespaces::$owl.'Class')
-           ->sourceInterface(variable_get("osf_searchapi_settings_interface_name", ''))
+           ->sourceInterface(variable_get("osf_searchapi_settings_interface_name", 'default'))
            ->send(new DrupalQuerierExtension());
 
     if(!$search->isSuccessful())
@@ -3196,7 +3196,7 @@ function osf_entities_properties_autocomplete($bundle, $query)
   $search->extendedFilters($extendedSearch->getExtendedFilters())
          ->attributeValuesFilters(Namespaces::$iron.'prefLabel', '*'.$query.'**')
          ->excludeAggregates()
-         ->sourceInterface(variable_get("osf_searchapi_settings_interface_name", ''))
+         ->sourceInterface(variable_get("osf_searchapi_settings_interface_name", 'default'))
          ->mime('resultset')
          ->send(new DrupalQuerierExtension());        
          
diff --git a/modules/osf_field/osf_field.module b/modules/osf_field/osf_field.module
index b6c1025..489cdd9 100644
--- a/modules/osf_field/osf_field.module
+++ b/modules/osf_field/osf_field.module
@@ -751,7 +751,7 @@ function osf_field_text_autocomplete($session_key, $query) {
   $labelProperties = Namespaces::getLabelProperties();
 
   $search->excludeAggregates()
-         ->sourceInterface(variable_get("osf_searchapi_settings_interface_name", ''))
+         ->sourceInterface(variable_get("osf_searchapi_settings_interface_name", 'default'))
          ->items(99) // Limit to 99 because 100+ just returns nothing.
          ->sort('preflabel', 'asc')
          ->attributeValuesFilters(Namespaces::$iron.'prefLabel', $query);
diff --git a/modules/osf_fieldstorage/osf_fieldstorage.admin.inc b/modules/osf_fieldstorage/osf_fieldstorage.admin.inc
index 1f035ca..20ca4cf 100644
--- a/modules/osf_fieldstorage/osf_fieldstorage.admin.inc
+++ b/modules/osf_fieldstorage/osf_fieldstorage.admin.inc
@@ -325,7 +325,7 @@ function osf_fieldstorage_classes_autocomplete($query) {
     
     $search->datasetsFilters($ontologiesFilters)
            ->typeFilter(Namespaces::$owl.'Class')
-           ->sourceInterface(variable_get("osf_searchapi_settings_interface_name", ''))
+           ->sourceInterface(variable_get("osf_searchapi_settings_interface_name", 'default'))
            ->send(new DrupalQuerierExtension());
     
     if(!$search->isSuccessful())
@@ -429,7 +429,7 @@ function osf_fieldstorage_literal_predicates_autocomplete($query) {
     $search->datasetsFilters($ontologiesFilters)
            ->typeFilter(Namespaces::$owl.'DatatypeProperty')
            ->typeFilter(Namespaces::$owl.'AnnotationProperty')
-           ->sourceInterface(variable_get("osf_searchapi_settings_interface_name", ''))
+           ->sourceInterface(variable_get("osf_searchapi_settings_interface_name", 'default'))
            ->send(new DrupalQuerierExtension());
 
     if(!$search->isSuccessful())
@@ -527,7 +527,7 @@ function osf_fieldstorage_relation_predicates_autocomplete($query) {
     
     $search->datasetsFilters($ontologiesFilters)
            ->typeFilter(Namespaces::$owl.'ObjectProperty')
-           ->sourceInterface(variable_get("osf_searchapi_settings_interface_name", ''))
+           ->sourceInterface(variable_get("osf_searchapi_settings_interface_name", 'default'))
            ->send(new DrupalQuerierExtension());
 
     if(!$search->isSuccessful())
diff --git a/modules/osf_ontology/osf_ontology.install b/modules/osf_ontology/osf_ontology.install
index c619524..2fbaefb 100644
--- a/modules/osf_ontology/osf_ontology.install
+++ b/modules/osf_ontology/osf_ontology.install
@@ -1,5 +1,11 @@
 <?php
-   
+  /**
+   * Temporary fix to not let the site freeze up on update because of missing library.
+   * 
+   */        
+  set_include_path ( getcwd() .'/sites/all/libraries/OSF-WS-PHP-API/' );
+  include_once("StructuredDynamics/SplClassLoader.php"); 
+  /* end of fix */
   use \StructuredDynamics\osf\php\api\ws\ontology\read\OntologyReadQuery;
   use \StructuredDynamics\osf\php\api\ws\ontology\read\GetLoadedOntologiesFunction;
 
diff --git a/modules/osf_searchapi/osf_searchapi.module b/modules/osf_searchapi/osf_searchapi.module
index 2795458..36feef4 100644
--- a/modules/osf_searchapi/osf_searchapi.module
+++ b/modules/osf_searchapi/osf_searchapi.module
@@ -222,7 +222,7 @@ function osf_searchapi_settings() {
   $form['interface']["osf_searchapi_settings_interface_name"] = array(
     '#type' => 'textfield',
     '#title' => t('Interface Name'),
-    '#default_value' => variable_get("osf_searchapi_settings_interface_name", ''),
+    '#default_value' => variable_get("osf_searchapi_settings_interface_name", 'default'),
     '#size' => 64,
     '#maxlength' => 64,
     '#description' => t("Name of the Search Interface to use. This name is case sensitive. If this field is blank, the default interface will be used."),
diff --git a/osf.install b/osf.install
index e36eb0a..4bb5548 100755
--- a/osf.install
+++ b/osf.install
@@ -66,6 +66,12 @@ function osf_requirements($phase) {
     else {
       $requirements['osf_phpapi']['value'] = $t('Missing');
       $requirements['osf_phpapi']['description'] = $t('You must download it from <a href="https://github.com/structureddynamics/OSF-WS-PHP-API/downloads" target="_blank">Github</a> and install it in sites/all/libraries or sites/[sitename]/libraries');
+      #Check if library is installed under the wrong folder, check for common alternatives
+      $lib2 = libraries_detect('OSF-Web-Services-PHP-API');
+      $lib3 = libraries_detect('OSF-Web-Services-PHP-API-3.1');
+      if($lib2['installed'] || $lib3['installed']){
+        $requirements['osf_phpapi']['description'] .= $t('You might have downloaded the libraries but stored it under an invalid folder like "OSF-Web-Services-PHP-API". Please rename the folder to "OSF-WS-PHP-API" and run update');    
+      }
       $requirements['osf_phpapi']['severity'] = REQUIREMENT_WARNING;
     }
   }