diff --git a/accessible_api/accessible_api.module b/accessible_api/accessible_api.module
index b94c5ea..a1ff481 100644
--- a/accessible_api/accessible_api.module
+++ b/accessible_api/accessible_api.module
@@ -125,10 +125,10 @@ function accessible_api_data($type = NULL, $subtype = NULL) {
       drupal_alter('accessible_api_data', $accessible_api_data);
     }
   }
-  if ($type && $subtype) {
+  if ($type && $subtype && isset($accessible_api_data[$type][$subtype])) {
     return $accessible_api_data[$type][$subtype];
   }
-  elseif ($type)  {
+  elseif ($type && isset($accessible_api_data[$type])) {
     return $accessible_api_data[$type];
   }
   else {
@@ -175,7 +175,7 @@ function accessible_api_settings($type = NULL, $subtype = NULL, $reset = FALSE)
  * all settings should go through this function
  * to make transition to drupal 8 config model easier
  */
-function accessible_api_settings_save($data, $type = NULL, $subtype = NULL, $clear_theme_cache = FALSE) {
+function accessible_api_settings_save(array $data, $type = NULL, $subtype = NULL, $clear_theme_cache = FALSE) {
 
   $old_settings = variable_get('accessible_api_settings', array());
   $new_settings = $old_settings;
diff --git a/accessible_fix/accessible_fix.install b/accessible_fix/accessible_fix.install
index dbad108..f978a80 100644
--- a/accessible_fix/accessible_fix.install
+++ b/accessible_fix/accessible_fix.install
@@ -37,6 +37,7 @@ function _accessible_fix_uninstall_fixes_config() {
    $function_name = 'accessible_fix_uninstall_'. $module_name;
    require_once('module_fixes/'. $module_name . '.admin.inc');
    if (function_exists($function_name)) {
+     require_once(drupal_get_path('module', 'accessible_api') . '/accessible_api.module');
      $accessible_api_settings = accessible_api_settings();
      //dpm('calling:'. $function_name);
      //dpm($accessible_api_settings);
diff --git a/accessible_fix/module_fixes/block.admin.inc b/accessible_fix/module_fixes/block.admin.inc
index 9ef44ca..acd465a 100644
--- a/accessible_fix/module_fixes/block.admin.inc
+++ b/accessible_fix/module_fixes/block.admin.inc
@@ -60,6 +60,6 @@ function accessible_fix_accessibility_api_data_alter_block($accessibility_data)
  * implementation of accessible_fix_uninstall_hook pseudo hook
  * this hook is only used by accessible fix module
  */
-function accessible_fix_uninstall_block(&$accessible_api_settings) {
+function accessible_fix_uninstall_block($accessible_api_settings) {
   return $accessible_api_settings;
 }
diff --git a/accessible_fix/module_fixes/node.admin.inc b/accessible_fix/module_fixes/node.admin.inc
index 06bba1b..135da3e 100644
--- a/accessible_fix/module_fixes/node.admin.inc
+++ b/accessible_fix/module_fixes/node.admin.inc
@@ -4,7 +4,7 @@
  * implementation of accessible_fix_uninstall_hook pseudo hook
  * this hook is only used by accessible fix module
  */
-function accessible_fix_uninstall_node(&$accessible_api_settings) {
+function accessible_fix_uninstall_node($accessible_api_settings) {
  return $accessible_api_settings;
 }