diff --git a/.gitignore b/.gitignore
index abd441029..02ca98569 100644
--- a/.gitignore
+++ b/.gitignore
@@ -177,21 +177,6 @@ external/boost/
 tmp/
 
 # CMake
-CMakeLists.txt.user
-CMakeCache.txt
-CMakeFiles/
-CMakeScripts
-cmake_install.cmake
-install_manifest.txt
-compile_commands.json
-CTestTestfile.cmake
-_deps
-
-Makefile
-*.vcxproj
-*.vcxproj.filters
-*.vcxproj.user
-Win32/
-Debug/
+build/
 
 
diff --git a/MakefileKompute b/Makefile
similarity index 96%
rename from MakefileKompute
rename to Makefile
index 6d9c9463a..24d0e45b3 100755
--- a/MakefileKompute
+++ b/Makefile
@@ -16,9 +16,11 @@ VCPKG=/c/Users/axsau/Programming/lib/vcpkg/vcpkg
 ####### Main Target Rules #######
 
 run_cmake:
-	cmake \
+	wcmake \
+		-Bbuild \
 		-DCMAKE_TOOLCHAIN_FILE=C:\\Users\\axsau\\Programming\\lib\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake \
-		-DCMAKE_EXPORT_COMPILE_COMMANDS=1
+		-DCMAKE_EXPORT_COMPILE_COMMANDS=1 \
+		-G "Visual Studio 16 2019"
 
 build: clean build_shaders
 	$(CC) \
diff --git a/src/Tensor.cpp b/src/Tensor.cpp
old mode 100644
new mode 100755
index 3c42e6cff..1f771163e
--- a/src/Tensor.cpp
+++ b/src/Tensor.cpp
@@ -18,7 +18,7 @@ Tensor::Tensor(std::vector<uint32_t> data, TensorTypes tensorType)
     SPDLOG_DEBUG("Kompute Tensor constructor data: {}, and type: {}", data, tensorType);
 
     this->mData = data;
-    this->mShape = { data.size() };
+    this->mShape = { static_cast<uint32_t>(data.size()) };
     this->mTensorType = tensorType;
 }