8 files changed, 15 insertions, 11 deletions
diff --git a/src/core/hle/service/apt.h b/src/core/hle/service/apt.h
index 4c7dd07e..5af39e08 100644
--- a/src/core/hle/service/apt.h
+++ b/src/core/hle/service/apt.h
@@ -29,7 +29,7 @@ public:
      * Gets the string port name used by CTROS for the service
      * @return Port name of service
      */
-    std::string GetPortName() const {
+    std::string GetPortName() const override {
         return "APT:U";
     }
 };
diff --git a/src/core/hle/service/fs.h b/src/core/hle/service/fs.h
index 36f3697d..00538254 100644
--- a/src/core/hle/service/fs.h
+++ b/src/core/hle/service/fs.h
@@ -23,7 +23,7 @@ public:
      * Gets the string port name used by CTROS for the service
      * @return Port name of service
      */
-    std::string GetPortName() const {
+    std::string GetPortName() const override {
         return "fs:USER";
     }
 };
diff --git a/src/core/hle/service/gsp.h b/src/core/hle/service/gsp.h
index a09d59db..177ce8da 100644
--- a/src/core/hle/service/gsp.h
+++ b/src/core/hle/service/gsp.h
@@ -167,7 +167,7 @@ public:
      * Gets the string port name used by CTROS for the service
      * @return Port name of service
      */
-    std::string GetPortName() const {
+    std::string GetPortName() const override {
         return "gsp::Gpu";
     }
 
diff --git a/src/core/hle/service/hid.cpp b/src/core/hle/service/hid.cpp
index b6ec1b8f..ef38a560 100644
--- a/src/core/hle/service/hid.cpp
+++ b/src/core/hle/service/hid.cpp
@@ -78,6 +78,10 @@ void PadButtonRelease(PadState pad_state) {
 void PadUpdateComplete() {
     PadData* pad_data = GetPadData();
 
+    if (pad_data == nullptr) {
+        return;
+    }
+
     // Update PadData struct
     pad_data->current_state.hex = next_state.hex;
     pad_data->index = next_index;
diff --git a/src/core/hle/service/hid.h b/src/core/hle/service/hid.h
index a077e25c..9f6c4d5e 100644
--- a/src/core/hle/service/hid.h
+++ b/src/core/hle/service/hid.h
@@ -111,7 +111,7 @@ public:
      * Gets the string port name used by CTROS for the service
      * @return Port name of service
      */
-    std::string GetPortName() const {
+    std::string GetPortName() const override {
         return "hid:USER";
     }
 
diff --git a/src/core/hle/service/ndm.h b/src/core/hle/service/ndm.h
index d5ec28f5..2ca9fcf2 100644
--- a/src/core/hle/service/ndm.h
+++ b/src/core/hle/service/ndm.h
@@ -24,7 +24,7 @@ public:
      * Gets the string port name used by CTROS for the service
      * @return Port name of service
      */
-    std::string GetPortName() const {
+    std::string GetPortName() const override {
         return "ndm:u";
     }
 
diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h
index c0e803bd..2f5a866c 100644
--- a/src/core/hle/service/service.h
+++ b/src/core/hle/service/service.h
@@ -39,11 +39,11 @@ class Interface  : public Kernel::Object {
     friend class Manager;
 public:
     
-    std::string GetName() const { return GetPortName(); }
-    std::string GetTypeName() const { return GetPortName(); }
+    std::string GetName() const override { return GetPortName(); }
+    std::string GetTypeName() const override { return GetPortName(); }
 
     static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Service; }
-    Kernel::HandleType GetHandleType() const { return Kernel::HandleType::Service; }
+    Kernel::HandleType GetHandleType() const override { return Kernel::HandleType::Service; }
 
     typedef void (*Function)(Interface*);
 
@@ -80,7 +80,7 @@ public:
      * @param wait Boolean wait set if current thread should wait as a result of sync operation
      * @return Result of operation, 0 on success, otherwise error code
      */
-    Result SyncRequest(bool* wait) {
+    Result SyncRequest(bool* wait) override {
         u32* cmd_buff = GetCommandBuffer();
         auto itr = m_functions.find(cmd_buff[0]);
 
@@ -113,7 +113,7 @@ public:
      * @param wait Boolean wait set if current thread should wait as a result of sync operation
      * @return Result of operation, 0 on success, otherwise error code
      */
-    Result WaitSynchronization(bool* wait) {
+    Result WaitSynchronization(bool* wait) override {
         // TODO(bunnei): ImplementMe
         ERROR_LOG(OSHLE, "unimplemented function");
         return 0;
diff --git a/src/core/hle/service/srv.h b/src/core/hle/service/srv.h
index 9451472d..6d5fe504 100644
--- a/src/core/hle/service/srv.h
+++ b/src/core/hle/service/srv.h
@@ -22,7 +22,7 @@ public:
      * Gets the string name used by CTROS for the service
      * @return Port name of service
      */
-    std::string GetPortName() const {
+    std::string GetPortName() const override {
         return "srv:";
     }