diff --git a/Engine/Src/Imp/CPP/FontManager.cpp b/Engine/Src/Imp/CPP/FontManager.cpp
index fbfe1b1..a8dc1fd 100644
--- a/Engine/Src/Imp/CPP/FontManager.cpp
+++ b/Engine/Src/Imp/CPP/FontManager.cpp
@@ -32,7 +32,7 @@ namespace ia::iae
         if (FT_Init_FreeType(&g_freetype))
             THROW_UNKNOWN("Failed to initialize the FreeType font library");
 
-        LoadFont("Roboto", "Resources/Fonts/Roboto-Black.ttf");
+        //LoadFont("Roboto", "Resources/Fonts/Roboto-Black.ttf");
     }
 
     VOID FontManager::Terminate()
diff --git a/Engine/Src/Imp/CPP/InputManager.cpp b/Engine/Src/Imp/CPP/InputManager.cpp
index 3a1686d..4aa28bd 100644
--- a/Engine/Src/Imp/CPP/InputManager.cpp
+++ b/Engine/Src/Imp/CPP/InputManager.cpp
@@ -74,7 +74,8 @@ namespace ia::iae
 
         case SDL_EVENT_FINGER_MOTION:
         case SDL_EVENT_MOUSE_MOTION:
-            s_pointerPosition = {event->motion.x, event->motion.y};
+            if((event->motion.x >= 1) && (event->motion.y >= 1))
+                s_pointerPosition = {event->motion.x, event->motion.y};
             break;
 
         case SDL_EVENT_MOUSE_BUTTON_DOWN:
@@ -236,6 +237,10 @@ namespace ia::iae
             STATIC CONSTEXPR INT16 DIRECTION_MAP_VERTICAL[] = {0, 1, 1, 1, 0, -1, -1, -1};
             STATIC CONSTEXPR INT16 DIRECTION_MAP_HORIZONTAL[] = {1, 1, 0, -1, -1, -1, 0, 1};
 
+            const auto ps = g_onScreenGamepadState;
+            g_onScreenGamepadState.ThumbstickPosition *= Engine::GetSceneScalingFactor();
+            g_onScreenGamepadState.ThumbstickRadius *= Engine::GetSceneScalingFactor().x;
+
             if (Engine::Input_IsPointerDown(g_onScreenGamepadState.ThumbstickPosition,
                                             g_onScreenGamepadState.ThumbstickRadius))
                 g_onScreenGamepadState.KnobPosition =
@@ -257,6 +262,9 @@ namespace ia::iae
                 s_verticalAxis = DIRECTION_MAP_VERTICAL[t];
                 s_horizontalAxis = DIRECTION_MAP_HORIZONTAL[t];
             }
+
+            g_onScreenGamepadState.ThumbstickPosition = ps.ThumbstickPosition;
+            g_onScreenGamepadState.ThumbstickRadius = ps.ThumbstickRadius;
         }
 
         if (s_keyboardGamePadEnabled)
diff --git a/Engine/Src/Imp/CPP/InternalEngine.cpp b/Engine/Src/Imp/CPP/InternalEngine.cpp
index d238312..5549799 100644
--- a/Engine/Src/Imp/CPP/InternalEngine.cpp
+++ b/Engine/Src/Imp/CPP/InternalEngine.cpp
@@ -65,6 +65,10 @@ namespace ia::iae
 
         // SDL_SetWindowResizable(g_windowHandle, false);
 
+#if __ANDROID__
+        SDL_SetWindowFullscreen(g_windowHandle, true);
+#endif
+
         const auto gameVersion = g_gameVersion;
         SDL_SetAppMetadata(g_gameName.c_str(), IA_STRINGIFY_VERSION(gameVersion).c_str(), g_gamePackageName.c_str());