diff --git a/project/include/renderer/opengl/OpenGLContext.h b/project/include/renderer/opengl/OpenGLContext.h
index 7cec13668..f690ec7b2 100644
--- a/project/include/renderer/opengl/OpenGLContext.h
+++ b/project/include/renderer/opengl/OpenGLContext.h
@@ -69,7 +69,7 @@ namespace lime {
 			QuickVec<GLuint> mZombieVbos;
 			
 			#ifdef ANDROID
-			OpenGLS3D *mS3D;
+			OpenGLS3D mS3D;
 			#endif
 	};
 	
diff --git a/project/src/backend/sdl/SDLStage.cpp b/project/src/backend/sdl/SDLStage.cpp
index f1d5c4091..66bce7345 100644
--- a/project/src/backend/sdl/SDLStage.cpp
+++ b/project/src/backend/sdl/SDLStage.cpp
@@ -685,7 +685,11 @@ public:
    double mDownY;
    
    const char *getJoystickName(int id) {
+      #if !defined(BLACKBERRY) && !defined(EMSCRIPTEN)
       return SDL_JoystickNameForIndex(id);
+      #else
+      return "";
+      #endif
    }
 
    Surface *GetPrimarySurface()