diff --git a/lib/addons.sh b/lib/addons.sh
index 09c6500..752de47 100644
--- a/lib/addons.sh
+++ b/lib/addons.sh
@@ -951,7 +951,7 @@ function bashio::addon.blk_write() {
 function bashio::require.protected() {
     local protected
 
-    protected=$(bashio::addon.protected)
+    protected=$(bashio::addon.protected 'self')
     if bashio::var.true "${protected}"; then
         return "${__BASHIO_EXIT_OK}"
     fi
@@ -978,7 +978,7 @@ function bashio::require.protected() {
 function bashio::require.unprotected() {
     local protected
 
-    protected=$(bashio::addon.protected)
+    protected=$(bashio::addon.protected 'self')
     if bashio::var.false "${protected}"; then
         return "${__BASHIO_EXIT_OK}"
     fi
diff --git a/lib/bashio.sh b/lib/bashio.sh
index 2ab8e85..c35cf50 100644
--- a/lib/bashio.sh
+++ b/lib/bashio.sh
@@ -21,7 +21,7 @@ readonly BASHIO_VERSION="0.1.0"
 # Stores the location of this library
 readonly __BASHIO_LIB_DIR=$(dirname "${BASH_SOURCE[0]}")
 
-# shellcheck source=const.sh
+# shellcheck source=lib/const.sh
 source "${__BASHIO_LIB_DIR}/const.sh"
 
 # Defaults
@@ -38,47 +38,47 @@ declare __BASHIO_HA_SECRETS=${HA_SECRETS:-${__BASHIO_DEFAULT_SECRETS}}
 # ==============================================================================
 # MODULES
 # ==============================================================================
-# shellcheck source=color.sh
+# shellcheck source=lib/color.sh
 source "${__BASHIO_LIB_DIR}/color.sh"
-# shellcheck source=log.sh
+# shellcheck source=lib/log.sh
 source "${__BASHIO_LIB_DIR}/log.sh"
 
-# shellcheck source=fs.sh
+# shellcheck source=lib/fs.sh
 source "${__BASHIO_LIB_DIR}/fs.sh"
-# shellcheck source=cache.sh
+# shellcheck source=lib/cache.sh
 source "${__BASHIO_LIB_DIR}/cache.sh"
 
-# shellcheck source=addons.sh
+# shellcheck source=lib/addons.sh
 source "${__BASHIO_LIB_DIR}/addons.sh"
-# shellcheck source=api.sh
+# shellcheck source=lib/api.sh
 source "${__BASHIO_LIB_DIR}/api.sh"
-# shellcheck source=config.sh
+# shellcheck source=lib/config.sh
 source "${__BASHIO_LIB_DIR}/config.sh"
-# shellcheck source=debug.sh
+# shellcheck source=lib/debug.sh
 source "${__BASHIO_LIB_DIR}/debug.sh"
-# shellcheck source=exit.sh
+# shellcheck source=lib/exit.sh
 source "${__BASHIO_LIB_DIR}/exit.sh"
-# shellcheck source=hardware.sh
+# shellcheck source=lib/hardware.sh
 source "${__BASHIO_LIB_DIR}/hardware.sh"
-# shellcheck source=hassos.sh
+# shellcheck source=lib/hassos.sh
 source "${__BASHIO_LIB_DIR}/hassos.sh"
-# shellcheck source=homeassistant.sh
+# shellcheck source=lib/homeassistant.sh
 source "${__BASHIO_LIB_DIR}/homeassistant.sh"
-# shellcheck source=host.sh
+# shellcheck source=lib/host.sh
 source "${__BASHIO_LIB_DIR}/host.sh"
-# shellcheck source=info.sh
+# shellcheck source=lib/info.sh
 source "${__BASHIO_LIB_DIR}/info.sh"
-# shellcheck source=jq.sh
+# shellcheck source=lib/jq.sh
 source "${__BASHIO_LIB_DIR}/jq.sh"
-# shellcheck source=pwned.sh
+# shellcheck source=lib/pwned.sh
 source "${__BASHIO_LIB_DIR}/pwned.sh"
-# shellcheck source=repositories.sh
+# shellcheck source=lib/repositories.sh
 source "${__BASHIO_LIB_DIR}/repositories.sh"
-# shellcheck source=secrets.sh
+# shellcheck source=lib/secrets.sh
 source "${__BASHIO_LIB_DIR}/secrets.sh"
-# shellcheck source=string.sh
+# shellcheck source=lib/string.sh
 source "${__BASHIO_LIB_DIR}/string.sh"
-# shellcheck source=supervisor.sh
+# shellcheck source=lib/supervisor.sh
 source "${__BASHIO_LIB_DIR}/supervisor.sh"
-# shellcheck source=var.sh
+# shellcheck source=lib/var.sh
 source "${__BASHIO_LIB_DIR}/var.sh"
diff --git a/lib/cache.sh b/lib/cache.sh
index e51a2df..631d848 100644
--- a/lib/cache.sh
+++ b/lib/cache.sh
@@ -40,7 +40,7 @@ function bashio::cache.get() {
         return "${__BASHIO_EXIT_NOK}"
     fi
 
-    printf "%s" "$(<${__BASHIO_CACHE_DIR}/"${key}".cache)"
+    printf "%s" "$(<"${__BASHIO_CACHE_DIR}/${key}.cache")"
     return "${__BASHIO_EXIT_OK}"
 }
 
diff --git a/lib/homeassistant.sh b/lib/homeassistant.sh
index ae1aa95..d02674f 100644
--- a/lib/homeassistant.sh
+++ b/lib/homeassistant.sh
@@ -219,7 +219,7 @@ function bashio::homeassistant.watchdog() {
 
     bashio::log.trace "${FUNCNAME[0]}:" "$@"
 
-    if bashio::var.has_value "${wait}"; then
+    if bashio::var.has_value "${watchdog}"; then
         watchdog=$(bashio::var.json watchdog "^${watchdog}")
         bashio::api.hassio POST /homeassistant/options "${watchdog}"
         bashio::cache.flush_all