diff --git a/build/android/patches/irrlicht-CEGL.patch b/build/android/patches/irrlicht-CEGL.patch
index b9c48f9d9..82adcedc2 100644
--- a/build/android/patches/irrlicht-CEGL.patch
+++ b/build/android/patches/irrlicht-CEGL.patch
@@ -1,5 +1,5 @@
 --- irrlicht/source/Irrlicht/CEGLManager.cpp.orig	2015-08-29 15:43:09.000000000 +0300
-+++ irrlicht/source/Irrlicht/CEGLManager.cpp	2016-09-20 01:09:05.259201198 +0300
++++ irrlicht/source/Irrlicht/CEGLManager.cpp	2016-10-17 23:43:12.963361978 +0300
 @@ -9,6 +9,10 @@
  #include "irrString.h"
  #include "os.h"
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 1a9befb12..7490aa567 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -118,7 +118,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("noclip", "false");
 	settings->setDefault("continuous_forward", "false");
 	settings->setDefault("cinematic", "false");
-	settings->setDefault("camera_smoothing", "0.1");
+	settings->setDefault("camera_smoothing", "0");
 	settings->setDefault("cinematic_camera_smoothing", "0.7");
 	settings->setDefault("fast_move", "false");
 	settings->setDefault("invert_mouse", "false");
@@ -361,7 +361,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("gui_scaling_filter_txr2img", "false");
 	settings->setDefault("max_simultaneous_block_sends_per_client", "5");
 	settings->setDefault("abm_interval", "2.0");
-	settings->setDefault("selectionbox_width", "7");
+	settings->setDefault("selectionbox_width", "6");
 	settings->setDefault("cloud_radius", "6");
 	settings->setDefault("client_unload_unused_data_timeout", "120");
 
diff --git a/src/drawscene.cpp b/src/drawscene.cpp
index e6650d478..405052452 100644
--- a/src/drawscene.cpp
+++ b/src/drawscene.cpp
@@ -511,9 +511,9 @@ void draw_load_screen(const std::wstring &text, IrrlichtDevice* device,
 		v2s32 barsize(
 				// 342 is (approximately) 256/0.75 to keep bar on same size as
 				// before with default settings
-				342 * porting::getDisplayDensity() *
+				342 * 1.2 * porting::getDisplayDensity() *
 				g_settings->getFloat("gui_scaling"),
-				g_fontengine->getTextHeight() * 2);
+				g_fontengine->getTextHeight() * 3);
 
 		core::rect<s32> barrect(center - barsize / 2, center + barsize / 2);
 		driver->draw2DRectangle(video::SColor(255, 255, 255, 255),barrect, NULL); // border
diff --git a/src/game.cpp b/src/game.cpp
index 3df7ca9cc..4107baf4a 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -2090,7 +2090,7 @@ bool Game::autoMigrateSingleplayerWorld(const std::string map_dir)
 	new_db->beginSave();
 	for (std::vector<v3s16>::const_iterator it = blocks.begin(); it != blocks.end(); ++it) {
 		std::string data;
-		old_db->loadBlock(*it, &data);
+		data = old_db->loadBlock(*it);
 		if (!data.empty())
 			new_db->saveBlock(*it, data);
 		else
diff --git a/src/gmp/mini-gmp.c b/src/gmp/mini-gmp.c
index 7300614dd..368e64ee0 100644
--- a/src/gmp/mini-gmp.c
+++ b/src/gmp/mini-gmp.c
@@ -13,14 +13,6 @@ it under the terms of either:
     Software Foundation; either version 3 of the License, or (at your
     option) any later version.
 
-or
-
-  * the GNU General Public License as published by the Free Software
-    Foundation; either version 2 of the License, or (at your option) any
-    later version.
-
-or both in parallel, as here.
-
 The GNU MP Library is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/src/gmp/mini-gmp.h b/src/gmp/mini-gmp.h
index 450c3e561..82b5bd915 100644
--- a/src/gmp/mini-gmp.h
+++ b/src/gmp/mini-gmp.h
@@ -11,14 +11,6 @@ it under the terms of either:
     Software Foundation; either version 3 of the License, or (at your
     option) any later version.
 
-or
-
-  * the GNU General Public License as published by the Free Software
-    Foundation; either version 2 of the License, or (at your option) any
-    later version.
-
-or both in parallel, as here.
-
 The GNU MP Library is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
diff --git a/src/hud.cpp b/src/hud.cpp
index a561b0fbf..23585dccd 100644
--- a/src/hud.cpp
+++ b/src/hud.cpp
@@ -103,7 +103,7 @@ Hud::Hud(video::IVideoDriver *driver, scene::ISceneManager* smgr,
 	if (mode == "box") {
 		m_use_selection_mesh = false;
 		m_selection_material.Thickness =
-			rangelim(g_settings->getS16("selectionbox_width"), 1, 7);
+			rangelim(g_settings->getS16("selectionbox_width"), 1, 6);
 	} else if (mode == "halo") {
 		m_use_selection_mesh = true;
 		m_selection_material.setTexture(0, tsrc->getTextureForMesh("halo.png"));
@@ -485,10 +485,10 @@ void Hud::drawCrosshair()
 				0, crosshair_argb, true);
 	} else {
 #ifdef __ANDROID__
-		driver->draw2DLine(m_displaycenter - v2s32(40, 0),
-				m_displaycenter + v2s32(40, 0), crosshair_argb);
-		driver->draw2DLine(m_displaycenter - v2s32(0, 40),
-				m_displaycenter + v2s32(0, 40), crosshair_argb);
+		driver->draw2DLine(m_displaycenter - v2s32(35, 0),
+				m_displaycenter + v2s32(35, 0), crosshair_argb);
+		driver->draw2DLine(m_displaycenter - v2s32(0, 35),
+				m_displaycenter + v2s32(0, 35), crosshair_argb);
 #else
 		driver->draw2DLine(m_displaycenter - v2s32(10, 0),
 				m_displaycenter + v2s32(10, 0), crosshair_argb);
diff --git a/src/touchscreengui.h b/src/touchscreengui.h
index ec2412c99..391021a0b 100644
--- a/src/touchscreengui.h
+++ b/src/touchscreengui.h
@@ -62,7 +62,7 @@ typedef enum {
 	after_last_element_id
 } touch_gui_button_id;
 
-#define MIN_DIG_TIME_MS 300
+#define MIN_DIG_TIME_MS 500
 #define MAX_TOUCH_COUNT 64
 #define BUTTON_REPEAT_DELAY 0.2f