diff --git a/Makefile b/Makefile
index b513f86..af918a6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 PROJECT_NAME              = wikilibras
 VLIBRAS_WIKILIBRAS_ENV   := /etc/profile.d/lavid/vlibras/wikilibras_env.sh
-PYBOSSA_CONF              = /etc/apache2/sites-available/pybossa.conf
-PROJECT_DIR               = $(CURDIR)
+PROJECT_DIR              := $(CURDIR)
 SED_REPLACE_ALL           = sed -i "s/$(1)/$(2)/g" "$(3)"
 SED_REPLACE_ALL_PATH      = sed -i "s\#$(1)\#$(2)\#g" "$(3)"
 
@@ -23,7 +22,7 @@ endif
 install: uninstall config env
 
 env:
-	@( \
+	@ ( \
 	    virtualenv ./env/; \
 	    . ./env/bin/activate; \
 	    pip install -U pip; \
@@ -52,7 +51,7 @@ endif
 	@ $(call SED_REPLACE_ALL,user1,$$USER,./contrib/apache/${PROJECT_NAME}.conf)
 	@ $(call SED_REPLACE_ALL,group1,$$USER,./contrib/apache/${PROJECT_NAME}.conf)
 	@ $(call SED_REPLACE_ALL_PATH,<path-to-project>,${PROJECT_DIR},./contrib/apache/${PROJECT_NAME}.conf)
-	@ sudo cp -u ${PYBOSSA_CONF} /etc/apache2/sites-available/wikilibras.conf
+	@ sudo cp -u "/etc/apache2/sites-available/pybossa.conf" /etc/apache2/sites-available/wikilibras.conf
 	@ if grep -q "WSGIScriptAlias /${PROJECT_NAME}" "/etc/apache2/sites-available/wikilibras.conf"; \
 	  then \
 	      echo "\33[33;1mA previous WSGI daemon definition for '${PROJECT_NAME}' in: /etc/apache2/sites-available/wikilibras.conf\33[0m"; \
@@ -84,4 +83,4 @@ run:
 	@ ( \
 	    . ./env/bin/activate; \
 	    python main.py; \
-	 )
+	)
diff --git a/settings_local.py.tmpl b/settings_local.py.tmpl
index 228c7e6..4e3cc75 100644
--- a/settings_local.py.tmpl
+++ b/settings_local.py.tmpl
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 # WikiLibras Server Configuration
 SERVER_HOST = "localhost"
 SERVER_PORT = 8003
--
libgit2 0.21.2