diff --git a/Makefile b/Makefile
index 7239dc1..300f89a 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ DOCKERFILE = "Dockerfile"
 PROJECT_PATH = $(shell pwd)
 
 define docker-build =
-	docker build -t ${IMAGE_NAME}:${VERSION} -f ${DOCKERFILE} .
+	docker build -t ${IMAGE_NAME}:${VERSION} -f dev/${DOCKERFILE} .
 	docker run --rm \
 		--name toolbox-ocppexample-tests \
 		-v ${PROJECT_PATH}:/go/ocppexample \
diff --git a/server.go b/server.go
index 6b153be..c862d16 100644
--- a/server.go
+++ b/server.go
@@ -120,7 +120,7 @@ func wsChargerHandler (w http.ResponseWriter, r *http.Request, ps httprouter.Par
 	// Get Charger from the Configs
 	chargerObj, err := ServerConfigs.GetChargerObj(chargerName)
 	if err != nil {
-		// There is no charger with specifed name in the configs
+		// There is no charger with specified name in the configs
 		http.Error(w, "Not allowed to connect for specified charger", http.StatusBadRequest)
 		log.Error_Log("Not allowed to connect for specified charger '%v' with error '%v'", chargerName, err)
 		return