diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/LibraryFilesFragment.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/LibraryFilesFragment.kt
index fcef3098..74b69753 100644
--- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/LibraryFilesFragment.kt
+++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/LibraryFilesFragment.kt
@@ -124,11 +124,10 @@ class LibraryFilesFragment : MainFragment() {
             }
         }
         fun leaveDirectory() {
-            if(navStack.size > 1) {
-                navStack.removeLast();
-                openDirectory(navStack.last());
+            if (navStack.size > 1) {
+                navStack.removeAt(navStack.size - 1)
+                openDirectory(navStack.last())
             }
-            else {}
         }
         fun openDirectory(stack: FileStack, addToStack: Boolean = false) {
             if(addToStack)
diff --git a/app/src/main/java/com/futo/platformplayer/states/StateAssets.kt b/app/src/main/java/com/futo/platformplayer/states/StateAssets.kt
index b4af2f61..f3254959 100644
--- a/app/src/main/java/com/futo/platformplayer/states/StateAssets.kt
+++ b/app/src/main/java/com/futo/platformplayer/states/StateAssets.kt
@@ -21,7 +21,7 @@ class StateAssets {
                 if(part == "." || part == "..") {
                     if(parentAllowance <= 0)
                         throw IllegalStateException("Path [${path}] attempted to escape path..");
-                    parts1.removeLast();
+                    parts1.removeAt(parts1.size - 1);
                     toSkip++;
                 }
                 else
diff --git a/app/src/main/java/com/futo/platformplayer/stores/SearchHistoryStorage.kt b/app/src/main/java/com/futo/platformplayer/stores/SearchHistoryStorage.kt
index 2bd43968..5c4df86c 100644
--- a/app/src/main/java/com/futo/platformplayer/stores/SearchHistoryStorage.kt
+++ b/app/src/main/java/com/futo/platformplayer/stores/SearchHistoryStorage.kt
@@ -11,7 +11,7 @@ class SearchHistoryStorage : FragmentedStorageFileJson() {
         if (!lastQueries.contains(text)) {
             lastQueries.add(0, text);
             if (lastQueries.size > 10)
-                lastQueries.removeLast();
+                lastQueries.removeAt(lastQueries.size - 1);
         }
         else {
             lastQueries.remove(text);