diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp
index 49d383b86..154c6736c 100644
--- a/src/client/content_cao.cpp
+++ b/src/client/content_cao.cpp
@@ -839,7 +839,6 @@ void GenericCAO::addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr)
 	updateAnimation();
 	updateBones(.0f);
 	updateAttachments();
-
 	setNodeLight(m_last_light);
 	updateMeshCulling();
 
diff --git a/src/client/game.cpp b/src/client/game.cpp
index 20465a7a0..2b82519f8 100644
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -2590,7 +2590,7 @@ void Game::openInventory()
 	 */
 
 	LocalPlayer *player = client->getEnv().getLocalPlayer();
-	if (!player || !player->getCAO())
+	if (!player)
 		return;
 
 	infostream << "Game: Launching inventory" << std::endl;
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index b7c4a5a57..bfcd47479 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -137,7 +137,7 @@ void fm_set_default_settings(Settings *settings) {
 	settings->setDefault("reconnects", win ? "1" : "10"); // TODO: wix windows
 
 	// Map generation
-	settings->setDefault("mg_name", "indev"); // "v6"
+	//settings->setDefault("mg_name", "indev"); // "v6"
 	//settings->setDefault("mg_flags", "trees, caves, dungeons"); // "dungeons"
 	//settings->setDefault("mgv6_spflags", "jungles, biome_blend, snowbiomes"); // "jungles, snowbiomes"
 	settings->setDefault("mg_math", ""); // configuration in json struct
diff --git a/src/server.cpp b/src/server.cpp
index 8d6824101..2cb033894 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -2493,6 +2493,7 @@ void Server::SendActiveObjectRemoveAdd(RemoteClient *client, PlayerSAO *playersa
 	}
 
 #if MINETEST_PROTO
+	Send(&pkt);
 #else
 	MSGPACK_PACKET_INIT(TOCLIENT_ACTIVE_OBJECT_REMOVE_ADD, 2);
 	PACK(TOCLIENT_ACTIVE_OBJECT_REMOVE_ADD_REMOVE, removed_objects_data);
diff --git a/src/threading/async.h b/src/threading/async.h
index 5b5c505b9..9801ae66e 100644
--- a/src/threading/async.h
+++ b/src/threading/async.h
@@ -44,7 +44,7 @@ class async_step_runner
 		DUMP("Async steps end", (long)this, runs, skips);
 #endif
 	}
-	int wait(const int ms = 60000, const int step_ms = 100)
+	int wait(const int ms = 300000, const int step_ms = 100)
 	{
 		int i = 0;
 		for (; i < ms / step_ms; ++i) { // 10s max