diff --git a/libraries/input-plugins/src/input-plugins/Joystick.h b/libraries/input-plugins/src/input-plugins/Joystick.h
index 131a8ced11..f8f98ca661 100644
--- a/libraries/input-plugins/src/input-plugins/Joystick.h
+++ b/libraries/input-plugins/src/input-plugins/Joystick.h
@@ -22,7 +22,7 @@
 
 #include "InputDevice.h"
 
-class Joystick : public QObject, InputDevice {
+class Joystick : public QObject, public InputDevice {
     Q_OBJECT
     Q_PROPERTY(QString name READ getName)
 
diff --git a/libraries/input-plugins/src/input-plugins/SDL2Manager.cpp b/libraries/input-plugins/src/input-plugins/SDL2Manager.cpp
index 8756006491..40ec26bf71 100644
--- a/libraries/input-plugins/src/input-plugins/SDL2Manager.cpp
+++ b/libraries/input-plugins/src/input-plugins/SDL2Manager.cpp
@@ -121,19 +121,21 @@ void SDL2Manager::pluginUpdate(float deltaTime) {
                     HFBackEvent backEvent(backType);
                     
                     qApp->sendEvent(qApp, &backEvent);
-                } else if (event.cbutton.button == SDL_CONTROLLER_BUTTON_A) {
-                    // this will either start or stop a global action event
-                    QEvent::Type actionType = (event.type == SDL_CONTROLLERBUTTONDOWN)
-                    ? HFActionEvent::startType()
-                    : HFActionEvent::endType();
-                    
-                    // global action events fire in the center of the screen
-                    Application* app = Application::getInstance();
-                    PickRay pickRay = app->getCamera()->computePickRay(app->getTrueMouseX(),
-                                                                       app->getTrueMouseY());
-                    HFActionEvent actionEvent(actionType, pickRay);
-                    qApp->sendEvent(qApp, &actionEvent);
                 }
+                // TODO: This will probably end up being deleted
+                //else if (event.cbutton.button == SDL_CONTROLLER_BUTTON_A) {
+                //    // this will either start or stop a global action event
+                //    QEvent::Type actionType = (event.type == SDL_CONTROLLERBUTTONDOWN)
+                //    ? HFActionEvent::startType()
+                //    : HFActionEvent::endType();
+                //    
+                //    // global action events fire in the center of the screen
+                //    Application* app = Application::getInstance();
+                //    PickRay pickRay = app->getCamera()->computePickRay(app->getTrueMouseX(),
+                //                                                       app->getTrueMouseY());
+                //    HFActionEvent actionEvent(actionType, pickRay);
+                //    qApp->sendEvent(qApp, &actionEvent);
+                //}
                 
             } else if (event.type == SDL_CONTROLLERDEVICEADDED) {
                 SDL_GameController* controller = SDL_GameControllerOpen(event.cdevice.which);