diff --git a/source/glest_game/world/map.cpp b/source/glest_game/world/map.cpp
index 82881a46..4ac05969 100644
--- a/source/glest_game/world/map.cpp
+++ b/source/glest_game/world/map.cpp
@@ -368,8 +368,8 @@ bool Map::isResourceNear(const Vec2i &pos, const ResourceType *rt, Vec2i &resour
 	if(resourceClickPos) {
 		//printf("+++++++++ unit [%s - %d] pos = [%s] resourceClickPos [%s]\n",unit->getFullName().c_str(),unit->getId(),pos.getString().c_str(),resourceClickPos->getString().c_str());
 	}
-	for(int i = -1; i <= size; ++i) {
-		for(int j = -1; j <= size; ++j) {
+	for(int i = -size; i <= size; ++i) {
+		for(int j = -size; j <= size; ++j) {
 			Vec2i resPos = Vec2i(pos.x + i, pos.y + j);
 			if(resourceClickPos) {
 				resPos = Vec2i(resourceClickPos->x + i, resourceClickPos->y + j);
@@ -389,8 +389,8 @@ bool Map::isResourceNear(const Vec2i &pos, const ResourceType *rt, Vec2i &resour
 								(distanceFromUnit < 0 || unit->getCenteredPos().dist(resPos) <= distanceFromUnit)) {
 
 								bool isResourceNextToUnit = (resourceClickPos == NULL);
-								for(int i1 = -1; isResourceNextToUnit == false && i1 <= size; ++i1) {
-									for(int j1 = -1; j1 <= size; ++j1) {
+								for(int i1 = -size; isResourceNextToUnit == false && i1 <= size; ++i1) {
+									for(int j1 = -size; j1 <= size; ++j1) {
 										Vec2i resPos1 = Vec2i(pos.x + i1, pos.y + j1);
 										if(resPos == resPos1) {
 											isResourceNextToUnit = true;
@@ -528,7 +528,7 @@ bool Map::isResourceNear(const Vec2i &pos, const ResourceType *rt, Vec2i &resour
 
 //returns if there is a resource next to a unit, in "resourcePos" is stored the relative position of the resource
 bool Map::isResourceNear(const Vec2i &pos, int size, const ResourceType *rt, Vec2i &resourcePos) const {
-	Vec2i p1 = pos + Vec2i(-1);
+	Vec2i p1 = pos + Vec2i(-size);
 	Vec2i p2 = pos + Vec2i(size);
 	Util::PerimeterIterator iter(p1, p2);
 	while (iter.more()) {
@@ -983,7 +983,7 @@ Vec2i Map::findBestBuildApproach(const Unit *unit, Vec2i originalBuildPos,const
 
 	float bestRange = -1;
 
-	Vec2i start = pos - Vec2i(1);
+	Vec2i start = pos - Vec2i(ut->getSize());
 	Vec2i end 	= pos + Vec2i(ut->getSize());
 
 	for(int i = start.x; i <= end.x; ++i) {
diff --git a/source/shared_lib/sources/platform/posix/socket.cpp b/source/shared_lib/sources/platform/posix/socket.cpp
index 4e9eca69..d510a2ae 100644
--- a/source/shared_lib/sources/platform/posix/socket.cpp
+++ b/source/shared_lib/sources/platform/posix/socket.cpp
@@ -2209,6 +2209,9 @@ bool UPNP_Tools::upnp_add_redirect(int ports[2]) {
 
 	if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] upnp_add_redir(%d : %d)\n",__FILE__,__FUNCTION__,__LINE__,ports[0],ports[1]);
 
+	if (!urls.controlURL || urls.controlURL[0] == '\0')	{
+		return false;
+	}
 #ifndef MEGAGLEST_EMBEDDED_MINIUPNPC
 	UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, externalIP);
 #else
@@ -2235,7 +2238,7 @@ bool UPNP_Tools::upnp_add_redirect(int ports[2]) {
 void UPNP_Tools::upnp_rem_redirect(int ext_port) {
 	if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] upnp_rem_redir(%d)\n",__FILE__,__FUNCTION__,__LINE__,ext_port);
 
-	if(urls.controlURL != NULL) {
+	if (urls.controlURL && urls.controlURL[0] != '\0')	{
 		char ext_port_str[16]="";
 		sprintf(ext_port_str, "%d", ext_port);