diff --git a/includes/admin/core/class-admin-upgrade.php b/includes/admin/core/class-admin-upgrade.php
index e48cb7c9..406431c8 100644
--- a/includes/admin/core/class-admin-upgrade.php
+++ b/includes/admin/core/class-admin-upgrade.php
@@ -17,6 +17,12 @@ if ( ! class_exists( 'um\admin\core\Admin_Upgrade' ) ) {
 	class Admin_Upgrade {
 
 
+		/**
+		 * @var null
+		 */
+		protected static $instance = null;
+
+
 		/**
 		 * @var
 		 */
@@ -31,6 +37,25 @@ if ( ! class_exists( 'um\admin\core\Admin_Upgrade' ) ) {
 		var $packages_dir;
 
 
+		/**
+		 * Main Admin_Upgrade Instance
+		 *
+		 * Ensures only one instance of UM is loaded or can be loaded.
+		 *
+		 * @since 1.0
+		 * @static
+		 * @see UM()
+		 * @return Admin_Upgrade - Main instance
+		 */
+		static public function instance() {
+			if ( is_null( self::$instance ) ) {
+				self::$instance = new self();
+			}
+
+			return self::$instance;
+		}
+
+
 		/**
 		 * Admin_Upgrade constructor.
 		 */
@@ -39,11 +64,14 @@ if ( ! class_exists( 'um\admin\core\Admin_Upgrade' ) ) {
 			$this->necessary_packages = $this->need_run_upgrades();
 
 			if ( ! empty( $this->necessary_packages ) ) {
-				$this->init_packages_ajax();
 				add_action( 'admin_menu', array( $this, 'admin_menu' ), 0 );
 
-				add_action( 'wp_ajax_um_run_package', array( $this, 'ajax_run_package' ) );
-				add_action( 'wp_ajax_um_get_packages', array( $this, 'ajax_get_packages' ) );
+				if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+					$this->init_packages_ajax();
+
+					add_action( 'wp_ajax_um_run_package', array( $this, 'ajax_run_package' ) );
+					add_action( 'wp_ajax_um_get_packages', array( $this, 'ajax_get_packages' ) );
+				}
 			}
 
 			//add_action( 'in_plugin_update_message-' . um_plugin, array( $this, 'in_plugin_update_message' ) );
@@ -143,7 +171,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Upgrade' ) ) {
 			foreach ( $this->necessary_packages as $package ) {
 				$hooks_file = $this->packages_dir . DIRECTORY_SEPARATOR . $package . DIRECTORY_SEPARATOR . 'hooks.php';
 				if ( file_exists( $hooks_file ) ) {
-					$pack_ajax_hooks = include $hooks_file;
+					$pack_ajax_hooks = include_once $hooks_file;
 
 					foreach ( $pack_ajax_hooks as $action => $function ) {
 						add_action( 'wp_ajax_um_' . $action, "um_upgrade_$function" );
@@ -160,7 +188,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Upgrade' ) ) {
 			foreach ( $this->necessary_packages as $package ) {
 				$handlers_file = $this->packages_dir . DIRECTORY_SEPARATOR . $package . DIRECTORY_SEPARATOR . 'functions.php';
 				if ( file_exists( $handlers_file ) ) {
-					include $handlers_file;
+					include_once $handlers_file;
 				}
 			}
 		}
@@ -290,7 +318,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Upgrade' ) ) {
 				exit('');
 			} else {
 				ob_start();
-				include $this->packages_dir . DIRECTORY_SEPARATOR . $_POST['pack'] . DIRECTORY_SEPARATOR . 'init.php';
+				include_once $this->packages_dir . DIRECTORY_SEPARATOR . $_POST['pack'] . DIRECTORY_SEPARATOR . 'init.php';
 				ob_get_flush();
 				exit;
 			}
diff --git a/includes/admin/core/packages/2.0-beta1/email_templates.php b/includes/admin/core/packages/2.0-beta1/email_templates.php
index 264c32dd..d30a3182 100644
--- a/includes/admin/core/packages/2.0-beta1/email_templates.php
+++ b/includes/admin/core/packages/2.0-beta1/email_templates.php
@@ -25,8 +25,8 @@ foreach ( $emails as $email_key => $value ) {
 		} else {
 			$setting_value = UM()->options()->get( $email_key );
 
-			$fp = fopen( $theme_template_path, "w" );
-			$result = fputs( $fp, $setting_value );
+			$fp = @fopen( $theme_template_path, "w" );
+			$result = @fputs( $fp, $setting_value );
 			fclose( $fp );
 		}
 	} else {
diff --git a/includes/class-init.php b/includes/class-init.php
index 0e9f1fc3..0cc6f25d 100644
--- a/includes/class-init.php
+++ b/includes/class-init.php
@@ -637,7 +637,8 @@ if ( ! class_exists( 'UM' ) ) {
 		 */
 		function admin_upgrade() {
 			if ( empty( $this->classes['admin_upgrade'] ) ) {
-				$this->classes['admin_upgrade'] = new um\admin\core\Admin_Upgrade();
+				$this->classes['admin_upgrade'] = um\admin\core\Admin_Upgrade::instance();
+				//$this->classes['admin_upgrade'] = new um\admin\core\Admin_Upgrade();
 			}
 			return $this->classes['admin_upgrade'];
 		}