diff --git a/builtin/common/chatcommands.lua b/builtin/common/chatcommands.lua
index 709c3d00a..bf989db7d 100644
--- a/builtin/common/chatcommands.lua
+++ b/builtin/common/chatcommands.lua
@@ -68,7 +68,7 @@ if INIT == "client" then
 					end
 				end
 			end
-			return false, "Invalid usage. (See /help " .. command .. ")"
+			return false, "Invalid usage. (See .help " .. command .. ")"
 		end
 		core.register_chatcommand(command, def)
 	end
diff --git a/src/client/game.cpp b/src/client/game.cpp
index 894f92b46..2e8a50294 100644
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -116,6 +116,8 @@ Game::Game() :
 		&updateAllMapBlocksCallback, this);
 	g_settings->registerChangedCallback("fullbright",
 		&updateAllMapBlocksCallback, this);
+	g_settings->registerChangedCallback("node_esp_nodes",
+		&updateAllMapBlocksCallback, this);
 		
 	readSettings();
 
@@ -182,6 +184,8 @@ Game::~Game()
 		&updateAllMapBlocksCallback, this);
 	g_settings->deregisterChangedCallback("fullbright",
 		&updateAllMapBlocksCallback, this);
+	g_settings->deregisterChangedCallback("node_esp_nodes",
+		&updateAllMapBlocksCallback, this);
 }
 
 bool Game::startup(bool *kill,
diff --git a/src/client/minimap.cpp b/src/client/minimap.cpp
index 68770ec19..9f1a104ba 100644
--- a/src/client/minimap.cpp
+++ b/src/client/minimap.cpp
@@ -474,8 +474,8 @@ void Minimap::drawMinimap()
 	core::matrix4 oldViewMat = driver->getTransform(video::ETS_VIEW);
 
 	driver->setViewPort(core::rect<s32>(
-		screensize.X - size - 10, 10,
-		screensize.X - 10, size + 10));
+		screensize.X - size * 2 - 10, 10,
+		screensize.X - size - 10, size + 10));
 	driver->setTransform(video::ETS_PROJECTION, core::matrix4());
 	driver->setTransform(video::ETS_VIEW, core::matrix4());
 
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 9c3cfe665..4c3d311db 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -320,7 +320,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("arm_inertia", "true");
 
 	settings->setDefault("enable_minimap", "true");
-	settings->setDefault("minimap_shape_round", "true");
+	settings->setDefault("minimap_shape_round", "false");
 	settings->setDefault("minimap_double_scan_height", "true");
 
 	// Effects
diff --git a/src/script/lua_api/CMakeLists.txt b/src/script/lua_api/CMakeLists.txt
index f6963f707..3f1b89085 100644
--- a/src/script/lua_api/CMakeLists.txt
+++ b/src/script/lua_api/CMakeLists.txt
@@ -6,7 +6,6 @@ set(common_SCRIPT_LUA_API_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/l_env.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/l_http.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/l_inventory.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/l_inventoryaction.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/l_item.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/l_itemstackmeta.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/l_mapgen.cpp
@@ -30,6 +29,7 @@ set(client_SCRIPT_LUA_API_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/l_camera.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/l_client.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/l_clientobject.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/l_inventoryaction.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/l_localplayer.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/l_mainmenu.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/l_minimap.cpp