diff --git a/bin/easyengine b/bin/easyengine
index cdde319d..52b5ee62 100644
--- a/bin/easyengine
+++ b/bin/easyengine
@@ -8,8 +8,7 @@ EE_FOURTH=$4
 EE_FIFTH=$5
 
 # Include library
-source  /usr/local/lib/easyengine/lib/ee_lib_variables.sh
-for ee_include in $(find /usr/local/lib/easyengine/ -iname "*.sh" ! -name ee_lib_variables.sh); do
+for ee_include in $(find /usr/local/lib/easyengine/ -iname "*.sh"); do
 	source $ee_include
 done
 
@@ -66,15 +65,19 @@ then
 				# Restart php5-fpm
 				if [ "$EE_THIRD" = "php" ];then
 					ee_lib_service php5-fpm restart
+
+					# Initialize Git
+					EE_GIT_DIR=/etc/php5/
+					ee_lib_git_init
 				else
 					# Restart nginx/mysql/postfix
 					ee_lib_service $EE_THIRD restart
+					
+					# Initialize Git
+					EE_GIT_DIR=/etc/$EE_THIRD/
+					ee_lib_git_init
 				fi
 
-				# Initialize Git
-				EE_GIT_DIR=/etc/$EE_THIRD/
-				ee_lib_git_init
-
 			fi
 
 			# Display success message
diff --git a/src/lib/ee_lib_gpg_key_fix.sh b/src/lib/ee_lib_gpg_key_fix.sh
index 179e2723..12819e08 100644
--- a/src/lib/ee_lib_gpg_key_fix.sh
+++ b/src/lib/ee_lib_gpg_key_fix.sh
@@ -5,7 +5,7 @@ function ee_lib_gpg_key_fix()
 	local ee_gpg_key_check
 
 	# GnuPG key check
-	EE_CONFIG_GET system.gpg-key-fix | grep -i true &>> $EE_COMMAND_LOG
+	$EE_CONFIG_GET system.gpg-key-fix | grep -i true &>> $EE_COMMAND_LOG
 
 	if [ $? -eq 0 ];then
 
diff --git a/src/modules/system/install/ee_mod_setup_nginx.sh b/src/modules/system/install/ee_mod_setup_nginx.sh
index da699bf8..02ea3f12 100644
--- a/src/modules/system/install/ee_mod_setup_nginx.sh
+++ b/src/modules/system/install/ee_mod_setup_nginx.sh
@@ -43,7 +43,7 @@ function ee_mod_setup_nginx()
 	fi
 
 	# Copy files
-	cp -v /usr/share/easyengine/nginx/conf.d /usr/share/easyengine/nginx/common /etc/nginx
+	cp -av /usr/share/easyengine/nginx/conf.d /usr/share/easyengine/nginx/common /etc/nginx
 
 	# Setup port 22222
 	cp -v /usr/share/easyengine/nginx/22222 /etc/nginx/sites-available/