diff --git a/.gitignore b/.gitignore
index 0d4474da5..6419b42df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,8 @@ vcpkg/
 vcpkg_installed/
 
 # IDEs
-.vscode/
+.vscode/*
+!.vscode/extensions.json
 .clion/
 CMakeLists.txt.user
 .kdev4/
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 000000000..3ba4e4114
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,6 @@
+{
+    "recommendations": [
+        "llvm-vs-code-extensions.vscode-clangd",
+        "xaver.clang-format"
+    ]
+}
diff --git a/lib/nw/rules/Dice.hpp b/lib/nw/rules/Dice.hpp
index af9b7e5ac..132eae0b1 100644
--- a/lib/nw/rules/Dice.hpp
+++ b/lib/nw/rules/Dice.hpp
@@ -14,7 +14,7 @@ bool operator==(const DiceRoll& lhs, const DiceRoll& rhs);
 bool operator<(const DiceRoll& lhs, const DiceRoll& rhs);
 
 /// Rolls a set of dice
-/// @param dice Dice to roll
+/// @param roll Dice to roll
 int roll_dice(DiceRoll roll);
 
 /// Rolls a set exploding of dice
diff --git a/tests/objects_creature.cpp b/tests/objects_creature.cpp
index 7d43be60a..d8b9871d3 100644
--- a/tests/objects_creature.cpp
+++ b/tests/objects_creature.cpp
@@ -1,4 +1,3 @@
-#include "nw/rules/combat.hpp"
 #include <catch2/catch_all.hpp>
 
 #include <nw/components/Creature.hpp>
@@ -6,14 +5,13 @@
 #include <nw/kernel/EventSystem.hpp>
 #include <nw/kernel/Objects.hpp>
 #include <nw/kernel/Rules.hpp>
+#include <nw/rules/combat.hpp>
 #include <nw/rules/feats.hpp>
 #include <nw/serialization/Archives.hpp>
 #include <nwn1/Profile.hpp>
 #include <nwn1/constants.hpp>
-#include <nwn1/constants/const_feat.hpp>
 #include <nwn1/effects.hpp>
 #include <nwn1/functions.hpp>
-#include <nwn1/functions/funcs_effects.hpp>
 
 #include <nlohmann/json.hpp>