diff --git a/firmware/export/config.h b/firmware/export/config.h
index 0db793d82d..5b84150347 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -1364,7 +1364,9 @@ Lyre prototype 1 */
 #define HAVE_PCM_FULL_DUPLEX
 #endif
 
+#if !defined(BOOTLOADER)
 #define HAVE_PITCHCONTROL
+#endif
 
 /* enable logging messages to disk*/
 #if !defined(BOOTLOADER) && !defined(__PCTOOL__)
diff --git a/firmware/sound.c b/firmware/sound.c
index c5e8213027..a2dfd300d4 100644
--- a/firmware/sound.c
+++ b/firmware/sound.c
@@ -637,7 +637,7 @@ void sound_set_pitch(int32_t pitch)
 
     audiohw_set_pitch(pitch);
     /* filter out invalid by grabbing the value actually set */
-    global_status.resume_pitch = dsp_get_pitch();
+    global_status.resume_pitch = audiohw_get_pitch();
 }
 
 int32_t sound_get_pitch(void)
diff --git a/lib/rbcodec/dsp/tdspeed.c b/lib/rbcodec/dsp/tdspeed.c
index bc3417d4ef..02a047a940 100644
--- a/lib/rbcodec/dsp/tdspeed.c
+++ b/lib/rbcodec/dsp/tdspeed.c
@@ -27,7 +27,7 @@
 #include "dsp-util.h"
 #include "dsp_proc_entry.h"
 #include "tdspeed.h"
-#ifdef ROCKBOX
+#if defined(ROCKBOX) && !defined(WARBLE)
 #include "settings.h"
 #endif
 
@@ -405,7 +405,7 @@ void dsp_set_timestretch(int32_t percent)
 
     struct dsp_config *dsp = dsp_get_config(CODEC_IDX_AUDIO);
     dsp_configure(dsp, TIMESTRETCH_SET_FACTOR, percent);
-#ifdef ROCKBOX /* filter out invalid by grabbing the value actually set */
+#if defined(ROCKBOX) && !defined(WARBLE) /* filter out invalid by grabbing the value actually set */
     global_status.resume_speed = st->factor;
 #endif
 }