diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
deleted file mode 100644
index 935b67e3830..00000000000
--- a/.github/workflows/build.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: "FAP Build"
-on:
-  push:
-    branches:
-      - feature_wifi_marauder_app
-  pull_request:
-  schedule:
-    # do a build every day
-    - cron: "1 1 * * *"
-jobs:
-  ufbt-build-action:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - name: dev channel
-            sdk-channel: dev
-          - name: release channel
-            sdk-channel: release
-          - name: Unleashed dev
-            sdk-index-url: https://up.unleashedflip.com/directory.json
-            sdk-channel: dev
-          - name: Unleashed release
-            sdk-index-url: https://up.unleashedflip.com/directory.json
-            sdk-channel: release
-    name: 'ufbt: Build for ${{ matrix.name }}'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      - name: Build with ufbt
-        uses: flipperdevices/flipperzero-ufbt-action@v0.1.2
-        id: build-app
-        with:
-          sdk-channel: ${{ matrix.sdk-channel }}
-          sdk-index-url: ${{ matrix.sdk-index-url }}
-      - name: Upload app artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ github.event.repository.name }}-${{ steps.build-app.outputs.suffix }}
-          path: ${{ steps.build-app.outputs.fap-artifacts }}
diff --git a/wifi_marauder_app.c b/wifi_marauder_app.c
index 97b1d97155f..333463394cf 100644
--- a/wifi_marauder_app.c
+++ b/wifi_marauder_app.c
@@ -175,6 +175,7 @@ int32_t wifi_marauder_app(void* p) {
     UNUSED(p);
 
     uint8_t attempts = 0;
+    bool otg_was_enabled = furi_hal_power_is_otg_enabled();
     while(!furi_hal_power_is_otg_enabled() && attempts++ < 5) {
         furi_hal_power_enable_otg();
         furi_delay_ms(10);
@@ -193,7 +194,7 @@ int32_t wifi_marauder_app(void* p) {
 
     wifi_marauder_app_free(wifi_marauder_app);
 
-    if(furi_hal_power_is_otg_enabled()) {
+    if(furi_hal_power_is_otg_enabled() && !otg_was_enabled) {
         furi_hal_power_disable_otg();
     }
 
diff --git a/wifi_marauder_text_input.c b/wifi_marauder_text_input.c
index e105b274df6..b5ab1d32eac 100644
--- a/wifi_marauder_text_input.c
+++ b/wifi_marauder_text_input.c
@@ -1,5 +1,6 @@
 #include "wifi_marauder_text_input.h"
 #include <gui/elements.h>
+#include "esp32_wifi_marauder_icons.h"
 #include "wifi_marauder_app_i.h"
 #include <furi.h>
 
@@ -135,8 +136,8 @@ static const WIFI_TextInputKey symbol_keyboard_keys_row_3[] = {
     {SWITCH_KEYBOARD_KEY, 1, 23},
     {'.', 15, 32},
     {',', 29, 32},
-    {';', 41, 32},
-    {'`', 53, 32},
+    {':', 41, 32},
+    {'/', 53, 32},
     {'\'', 65, 32},
     {ENTER_KEY, 74, 23},
     {'7', 100, 32},
@@ -232,6 +233,12 @@ static bool char_is_lowercase(char letter) {
 static char char_to_uppercase(const char letter) {
     if(letter == '_') {
         return 0x20;
+    } else if(letter == ':') {
+        return 0x3B;
+    } else if(letter == '/') {
+        return 0x5C;
+    } else if(letter == '\'') {
+        return 0x60;
     } else if(char_is_lowercase(letter)) {
         return (letter - 0x20);
     } else {
@@ -299,7 +306,7 @@ static void wifi_text_input_view_draw_callback(Canvas* canvas, void* _model) {
         while(len && canvas_string_width(canvas, str) > needed_string_width) {
             str[len--] = '\0';
         }
-        //strcat(str, "..."); // TODO - find replacement
+        strcat(str, "...");
     }
 
     canvas_draw_str(canvas, start_pos, 22, str);