Fixes: Fixed more Visual Studio warnings which appeared with the merge
Fixes: Fixed more Visual Studio warnings which appeared with the merge

Some new warnings popped up with the latest merge.

KhronosGroup/Vulkan-Tools,KhronosGroup/Vulkan-Tools,KhronosGroup/Vulkan-Tools,KhronosGroup/Vulkan-Tools