diff --git a/src/audio_sdl.cpp b/src/audio_sdl.cpp
index 533228c8..cd9bbd23 100644
--- a/src/audio_sdl.cpp
+++ b/src/audio_sdl.cpp
@@ -66,13 +66,13 @@ SdlAudio::SdlAudio() :
        GenericAudio()
 {
        if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0) {
-               Output::Warning("Couldn't init audio: %s", SDL_GetError());
+               Output::Error("Couldn't initialize audio.\n%s", SDL_GetError());
                return;
        }
        SDL_AudioSpec want = {0};
        SDL_AudioSpec have = {0};
-       want.freq = 44100;
+       want.freq = 22050;      //SEB Pandora 44100;
        want.format = AUDIO_S16;
        want.channels = 2;
        want.samples = 2048;
diff --git a/src/input_buttons_desktop.cpp b/src/input_buttons_desktop.cpp
old mode 100644
new mode 100755
index 6aeaa4e4..81efae7b
--- a/src/input_buttons_desktop.cpp
+++ b/src/input_buttons_desktop.cpp
@@ -45,6 +45,10 @@ void Input::InitButtons() {
        buttons[DECISION].push_back(Keys::SPACE);
        buttons[DECISION].push_back(Keys::RETURN);
        buttons[DECISION].push_back(Keys::SELECT);
+    if(getenv("FLIPBX"))
+        buttons[DECISION].push_back(Keys::PGDN);
+    else
+        buttons[DECISION].push_back(Keys::ENDS);
        buttons[CANCEL].push_back(Keys::AC_BACK);
        buttons[CANCEL].push_back(Keys::X);
        buttons[CANCEL].push_back(Keys::C);
@@ -53,6 +57,11 @@ void Input::InitButtons() {
        buttons[CANCEL].push_back(Keys::N);
        buttons[CANCEL].push_back(Keys::ESCAPE);
        buttons[CANCEL].push_back(Keys::KP0);
+    buttons[CANCEL].push_back(Keys::PGUP);
+    if(getenv("FLIPBX"))
+        buttons[SHIFT].push_back(Keys::ENDS);
+       else
+        buttons[SHIFT].push_back(Keys::PGDN);
        buttons[SHIFT].push_back(Keys::LSHIFT);
        buttons[SHIFT].push_back(Keys::RSHIFT);
        buttons[N0].push_back(Keys::N0);
diff --git a/tests/filefinder.cpp b/tests/filefinder.cpp
index 3c18b3d9..39e83a58 100644
--- a/tests/filefinder.cpp
+++ b/tests/filefinder.cpp
@@ -1,5 +1,6 @@
 #include <cassert>
 #include <cstdlib>
+#include <assert.h>
 #include "filefinder.h"
 #include "player.h"
 #include "reader_util.h"