diff --git a/modules/audio/audiomodule.h b/modules/audio/audiomodule.h
index 18f5deecee..ee93f24424 100644
--- a/modules/audio/audiomodule.h
+++ b/modules/audio/audiomodule.h
@@ -305,7 +305,7 @@ private:
      */
     std::unique_ptr<SoLoud::Wav> loadSound(const std::filesystem::path& path);
 
-    std::unique_ptr<SoLoud::Soloud> _engine = nullptr;
+    std::unique_ptr<SoLoud::Soloud> _engine;
 
     std::map<std::string, Info> _sounds;
 };
diff --git a/src/events/eventengine.cpp b/src/events/eventengine.cpp
index 7ac200a65b..6a7bf85070 100644
--- a/src/events/eventengine.cpp
+++ b/src/events/eventengine.cpp
@@ -78,7 +78,7 @@ void EventEngine::registerEventTopic(size_t topicId, events::Event::Type type,
                                      ScriptCallback callback)
 {
     TopicInfo ti;
-    ti.id = topicId;
+    ti.id = static_cast<uint32_t>(topicId);
     ti.callback = std::move(callback);
 
     _eventTopics[type].push_back(ti);
@@ -169,7 +169,7 @@ std::vector<EventEngine::ActionInfo> EventEngine::registeredActions() const {
     return result;
 }
 
-const std::unordered_map<events::Event::Type, std::vector<EventEngine::ActionInfo>>& const
+const std::unordered_map<events::Event::Type, std::vector<EventEngine::ActionInfo>>&
 EventEngine::eventActions() const
 {
     return _eventActions;
diff --git a/src/interaction/joystickinputstate.cpp b/src/interaction/joystickinputstate.cpp
index 321b0b5f0d..81ebeea250 100644
--- a/src/interaction/joystickinputstate.cpp
+++ b/src/interaction/joystickinputstate.cpp
@@ -90,8 +90,7 @@ float JoystickInputStates::axis(const std::string& joystickName, int axis) const
 
         // If multiple joysticks are connected, we might get values outside the -1,1 range
         // by summing them up
-        glm::clamp(res, -1.f, 1.f);
-        return res;
+        return glm::clamp(res, -1.f, 1.f);
     }
 
     for (const JoystickInputState& state : *this) {