diff --git a/code/web/public_php/setup/database.php b/code/web/public_php/setup/database.php
index c97d5a30d..75a3f0713 100644
--- a/code/web/public_php/setup/database.php
+++ b/code/web/public_php/setup/database.php
@@ -65,6 +65,7 @@ function upgrade_service_databases($continue_r) {
 	$con = null;
 	$con = connect_database($continue, "shard");
 	$continue = ($con != null);
+	global $db_nel;
 	for ($i = 1; $i <= $db_nel; $i++) {
 		if ($continue && get_db_version("shard") < $i) {
 			$continue = update_database_structure($continue, $con, "nel_" . str_pad($i, 5, "0", STR_PAD_LEFT) . ".sql");
@@ -76,6 +77,7 @@ function upgrade_service_databases($continue_r) {
 	$con = null;
 	$con = connect_database($continue, "tool");
 	$continue = ($con != null);
+	global $db_nel_tool;
 	for ($i = 1; $i <= $db_nel_tool; $i++) {
 		if ($continue && get_db_version("tool") < $i) {
 			$continue = update_database_structure($continue, $con, "nel_tool_" . str_pad($i, 5, "0", STR_PAD_LEFT) . ".sql");
@@ -93,6 +95,7 @@ function upgrade_support_databases($continue_r) {
 	$con = null;
 	$con = connect_database($continue, "web");
 	$continue = ($con != null);
+	global $db_nel_ams;
 	for ($i = 1; $i <= $db_nel_ams; $i++) {
 		if ($continue && get_db_version("web") < $i) {
 			$continue = update_database_structure($continue, $con, "nel_ams_" . str_pad($i, 5, "0", STR_PAD_LEFT) . ".sql");
@@ -104,6 +107,7 @@ function upgrade_support_databases($continue_r) {
 	$con = null;
 	$con = connect_database($continue, "lib");
 	$continue = ($con != null);
+	global $db_nel_ams_lib;
 	for ($i = 1; $i <= $db_nel_ams_lib; $i++) {
 		if ($continue && get_db_version("lib") < $i) {
 			$continue = update_database_structure($continue, $con, "nel_ams_lib_" . str_pad($i, 5, "0", STR_PAD_LEFT) . ".sql");
@@ -121,6 +125,7 @@ function upgrade_domain_databases($continue_r) {
 	$con = null;
 	$con = connect_database($continue, "ring");
 	$continue = ($con != null);
+	global $db_ring_domain;
 	for ($i = 1; $i <= $db_ring_domain; $i++) {
 		if ($continue && get_db_version("ring") < $i) {
 			$continue = update_database_structure($continue, $con, "ring_domain_" . str_pad($i, 5, "0", STR_PAD_LEFT) . ".sql");