diff --git a/include/Engine/Network/Package.h b/include/Engine/Network/Package.h
index 49118b6e..a7b3c126 100644
--- a/include/Engine/Network/Package.h
+++ b/include/Engine/Network/Package.h
@@ -13,7 +13,7 @@ public:
     // arg2: PackageID for identifying packet loss.
     Package(MessageType type, unsigned int& packageID);
     // Used to create package from already existing data buffer.
-    Package(char* data, int sizeOfPackage);
+    Package(char* data, const int sizeOfPackage);
     ~Package();
     // Add primitive types like int, float, char...
     template<typename T>
@@ -43,7 +43,7 @@ public:
     char* Data() { return m_Data; };
 
 private:
-    char* m_Data = new char[128];
+    char* m_Data;
     unsigned int m_ReturnDataOffset = 0;
     int m_Offset = 0;
 };
diff --git a/src/Engine/Network/Package.cpp b/src/Engine/Network/Package.cpp
index 729276a3..a30d3ee5 100644
--- a/src/Engine/Network/Package.cpp
+++ b/src/Engine/Network/Package.cpp
@@ -2,6 +2,7 @@
 
 Package::Package(MessageType type, unsigned int& packageID)
 {
+    m_Data = new char[128];
     // Create message header
     // Add message type
     int messageType = static_cast<int>(type);
@@ -12,9 +13,10 @@ Package::Package(MessageType type, unsigned int& packageID)
 }
 
 
-Package::Package(char* data, int sizeOfPackage)
+Package::Package(char* data, const int sizeOfPackage)
 {
     // Create message
+    m_Data = new char[sizeOfPackage];
     memcpy(m_Data, data, sizeOfPackage);
     m_Offset = sizeOfPackage;
 }
diff --git a/src/Game/PlayerSystem.cpp b/src/Game/PlayerSystem.cpp
index 6c7e8311..f10dba28 100644
--- a/src/Game/PlayerSystem.cpp
+++ b/src/Game/PlayerSystem.cpp
@@ -2,17 +2,17 @@
 
 void PlayerSystem::UpdateComponent(World * world, ComponentWrapper & player, double dt)
 {
-    (glm::vec3)player["Velocity"] = glm::vec3(0.f, 0.f, 0.f);
-    if (static_cast<bool>(player["Forward"])== true) {
+    player["Velocity"] = glm::vec3(0.f, 0.f, 0.f);
+    if ((bool&)player["Forward"] == true) {
         ((glm::vec3&)player["Velocity"]).z = m_Speed * float(dt) * -1;
     }
-    if (static_cast<bool>(player["Left"]) == true) {
+    if ((bool&)player["Left"] == true) {
         ((glm::vec3&)player["Velocity"]).x = m_Speed * float(dt) * -1;
     }
-    if (static_cast<bool>(player["Back"]) == true) {
+    if ((bool&)player["Back"] == true) {
         ((glm::vec3&)player["Velocity"]).z = m_Speed * float(dt);
     }
-    if (static_cast<bool>(player["Right"]) == true) {
+    if ((bool&)player["Right"] == true) {
         ((glm::vec3&)player["Velocity"]).x = m_Speed * float(dt);
     }