2 files changed, 9 insertions, 3 deletions

diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
index 4b60562af4..434ef319d3 100644
--- a/apps/plugins/SOURCES
+++ b/apps/plugins/SOURCES
@@ -1,3 +1,5 @@
+test_disk.c
+test_gfx.c
 /* plugins common to all models */
 chessclock.c
 credits.c
diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c
index 7a072894b2..3853912640 100644
--- a/firmware/drivers/lcd-bitmap-common.c
+++ b/firmware/drivers/lcd-bitmap-common.c
@@ -84,8 +84,8 @@ struct lcd_bitmap_char
 {
     char is_rtl;
     char is_diacritic;
-    unsigned short int width;
-    unsigned short base_width;
+    unsigned char width;
+    unsigned char base_width;
 };
 
 /* put a string at a given pixel position, skipping first ofs pixel columns */
@@ -120,7 +120,11 @@ static void LCDFN(putsxyofs)(int x, int y, int ofs, const unsigned char *str)
     ucs = bidi_l2v(str, 1);
     /* Mark diacritic and rtl flags for each character */
     for (i = 0; i < SCROLL_LINE_SIZE && ucs[i]; i++)
-        chars[i].is_diacritic = is_diacritic(ucs[i], &chars[i].is_rtl);
+    {
+        bool is_rtl;
+        chars[i].is_diacritic = is_diacritic(ucs[i], &is_rtl);
+        chars[i].is_rtl=is_rtl;
+    }
     len = i;
 
     /* Get proportional width and glyph bits */