2 files changed, 4 insertions, 5 deletions

diff --git a/firmware/common/unicode.c b/firmware/common/unicode.c
index 4e1b78f9e1..e2e2dc2f3a 100644
--- a/firmware/common/unicode.c
+++ b/firmware/common/unicode.c
@@ -92,7 +92,7 @@ unsigned char* utf8encode(unsigned long ucs, unsigned char *utf8)
     int tail = 0;
 
     if (ucs > 0x7F)
-        while (ucs >> (6*tail + 2))
+        while (ucs >> (5*tail + 6))
             tail++;
 
     *utf8++ = (ucs >> (6*tail)) | utf8comp[tail];
diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index b5f1ef83c7..5b1a543f2d 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -920,10 +920,9 @@ static struct trackdata *add_track_to_tag_list(const char *filename)
     track->mempos = audiobuf_write;
     track->id3.elapsed = 0;
 #ifdef HAVE_LCD_BITMAP
-    int w, h;
-    lcd_getstringsize(track->id3.title, &w, &h);
-    lcd_getstringsize(track->id3.artist, &w, &h);
-    lcd_getstringsize(track->id3.album, &w, &h);
+    lcd_getstringsize(track->id3.title, NULL, NULL);
+    lcd_getstringsize(track->id3.artist, NULL, NULL);
+    lcd_getstringsize(track->id3.album, NULL, NULL);
 #endif
 
     track_write_idx = (track_write_idx+1) & MAX_TRACK_ENTRIES_MASK;