diff --git a/src/eventthread.cpp b/src/eventthread.cpp
index f3e5f2e..8fb5449 100644
--- a/src/eventthread.cpp
+++ b/src/eventthread.cpp
@@ -352,9 +352,9 @@ void EventThread::process(RGSSThreadData &rtData)
 			}
 
 			if (rtData.acceptingTextInput) {
-				if (event.key.sym == SDLK_BACKSPACE && rtData.inputText.length() > 0)
+				if (event.key.key == SDLK_BACKSPACE && rtData.inputText.length() > 0)
 					rtData.inputText.pop_back();
-				else if (event.key.sym == SDLK_RETURN)
+				else if (event.key.key == SDLK_RETURN)
 					rtData.acceptingTextInput.clear();
 
 				break;
diff --git a/src/eventthread.h b/src/eventthread.h
index 961ef5f..21a18fe 100644
--- a/src/eventthread.h
+++ b/src/eventthread.h
@@ -37,8 +37,10 @@
 
 #include <stdint.h>
 
+#include <alc.h>
+//typedef struct ALCdevice_struct ALCdevice;
+
 struct RGSSThreadData;
-typedef struct ALCdevice_struct ALCdevice;
 struct SDL_Window;
 union SDL_Event;
 
diff --git a/src/settingsmenu.cpp b/src/settingsmenu.cpp
index 97d8172..b91595a 100644
--- a/src/settingsmenu.cpp
+++ b/src/settingsmenu.cpp
@@ -400,7 +400,7 @@ struct SettingsMenuPrivate
 	}
 
 	void fillSurface(SDL_Surface *surf, uint8_t grey){
-		SDL_FillSurfaceRect(surf, 0, SDL_MapRGBA(rgb, grey, grey, grey, 255));
+		SDL_FillSurfaceRect(surf, 0, SDL_MapSurfaceRGBA(surf, grey, grey, grey, 255));
 	}
 
 	void fillRect(SDL_Surface *surf,
@@ -408,7 +408,7 @@ struct SettingsMenuPrivate
 	              uint8_t r, uint8_t g, uint8_t b)
 	{
 		SDL_Rect rect = { drawOff.x+x, drawOff.y+y, w, h };
-		SDL_FillSurfaceRect(surf, &rect, SDL_MapRGB(rgb, r, g, b));
+		SDL_FillSurfaceRect(surf, &rect, SDL_MapSurfaceRGB(surf, r, g, b));
 	}
 
 	void fillRect(SDL_Surface *surf, uint8_t grey,
@@ -1077,7 +1077,7 @@ SettingsMenu::SettingsMenu(RGSSThreadData &rtData)
 	p->font = shState->fontState().getFont(getFontName(), getFontSize());
 
 
-	p->rgb = p->winSurf->format;
+	*p->rgb = p->winSurf->format;
 
 	const size_t layoutW = 2;
 	const size_t layoutH = 6;