diff --git a/.vscode/.gitignore b/.vscode/.gitignore
index dae89fb9..8bea7325 100644
--- a/.vscode/.gitignore
+++ b/.vscode/.gitignore
@@ -4,3 +4,4 @@
 /c_cpp_properties.json
 /tasks.json
 /settings.json
+/ps2dev-intellisense
\ No newline at end of file
diff --git a/README.MD b/README.MD
index 10a37363..bff83917 100644
--- a/README.MD
+++ b/README.MD
@@ -148,7 +148,7 @@ Distributed under the Apache License 2.0 License. See `LICENSE` for more informa
 Without these guys, Tyra would not happen:
 * [Dr Henry Fortuna](http://ps2-edu.tensioncore.com/index.html) - for code sources, PS2 academy tutorials
 * Whole [PS2DEV](https://github.com/ps2dev) team, and specially to [Rick Gaiser](https://github.com/rickgaiser), [fjtrujy](https://github.com/fjtrujy) - for a lot of good tips!
-* [Wellington Carvalho](https://github.com/Wellinator), [André Guilheme](https://github.com/wolfysdl) - for testing, contributing to Tyra and sharing cool ideas!
+* [Wellington Carvalho](https://github.com/Wellinator), [André Guilheme](https://github.com/Wolf3s) - for testing, contributing to Tyra and sharing cool ideas!
 * [Leonardo Ono](https://github.com/leonardo-ono) - for software renderer example (with clipping!)
 * [Lukasz D.K.](https://github.com/lukaszdk) - for huge archive of PS2 stuff
 * [Guilherme Lampert](https://github.com/glampert) - for code sources
diff --git a/engine/inc/file/file_utils.hpp b/engine/inc/file/file_utils.hpp
index dd5507d5..142856b9 100644
--- a/engine/inc/file/file_utils.hpp
+++ b/engine/inc/file/file_utils.hpp
@@ -11,6 +11,8 @@
 #pragma once
 
 #include <string>
+#include <limits.h>
+#include <syslimits.h>
 
 namespace Tyra {
 
@@ -42,9 +44,9 @@ class FileUtils {
 
  private:
   // Argv name+path & just path
-  char cwd[255];
-  char elfName[255];
-  char elfPath[255 - 14];
+  char cwd[NAME_MAX];
+  char elfName[NAME_MAX];
+  char elfPath[NAME_MAX - 14];
 
   void setPathInfo(const char* path);
 };
diff --git a/engine/inc/loaders/texture/builder/texture_builder_data.hpp b/engine/inc/loaders/texture/builder/texture_builder_data.hpp
index c6b515d0..6adb7bfb 100644
--- a/engine/inc/loaders/texture/builder/texture_builder_data.hpp
+++ b/engine/inc/loaders/texture/builder/texture_builder_data.hpp
@@ -24,13 +24,14 @@ class TextureBuilderData {
   std::string name;
 
   int width, height;
-  unsigned char* data;
+  u8* data;
   TextureBpp bpp;
-  unsigned char gsComponents;
+  u8 gsComponents;
 
   int clutWidth, clutHeight;
-  unsigned char* clut;
+  u8* clut;
   TextureBpp clutBpp;
-  unsigned char clutGsComponents;
+  u8 clutGsComponents;
 };
+
 }  // namespace Tyra
diff --git a/engine/inc/math/math.hpp b/engine/inc/math/math.hpp
index 2aa502ab..6b8b6794 100644
--- a/engine/inc/math/math.hpp
+++ b/engine/inc/math/math.hpp
@@ -36,9 +36,6 @@ class Math {
   static int randomi(const int& min, const int& max);
   static bool equalf(const float& a, const float& b,
                      const float& epsilon = 0.00001F);
-
- private:
-  Math();
 };
 
 }  // namespace Tyra
diff --git a/engine/src/file/file_utils.cpp b/engine/src/file/file_utils.cpp
index 7277baf2..ca310750 100644
--- a/engine/src/file/file_utils.cpp
+++ b/engine/src/file/file_utils.cpp
@@ -12,8 +12,7 @@
 #include <tamtypes.h>
 #include <cstdio>
 #include <kernel.h>
-#include <limits.h>
-#include <syslimits.h>
+
 #include <unistd.h>
 #include <cstring>
 #include "file/file_utils.hpp"