diff --git a/src/vkcv/Core.cpp b/src/vkcv/Core.cpp
index ff075c03aebb4847a0b37f81650cb2db472963ab..9880c06c54c784c786922dc0f011b6c2b3f5ad39 100644
--- a/src/vkcv/Core.cpp
+++ b/src/vkcv/Core.cpp
@@ -529,7 +529,6 @@ namespace vkcv
   
 		const auto swapchainImages = m_Context.getDevice().getSwapchainImagesKHR(m_SwapchainManager->getSwapchain(swapchainHandle).getSwapchain());
 
-		const auto& queueManager = m_Context.getQueueManager();
 		std::array<vk::Semaphore, 2> waitSemaphores{
 			m_SyncResources.renderFinished,
 			m_SyncResources.swapchainImageAcquired
diff --git a/src/vkcv/QueueManager.cpp b/src/vkcv/QueueManager.cpp
index 6f118595ca5cdbcb54adff1666d636e95b5b6415..2cfd0d7a832129b6f3bbdbeaf17494d0af3c928e 100644
--- a/src/vkcv/QueueManager.cpp
+++ b/src/vkcv/QueueManager.cpp
@@ -194,7 +194,7 @@ namespace vkcv {
                                       std::vector<std::pair<int, int>> &queuePairsTransfer) {
 
         std::vector<Queue> graphicsQueues = getQueues(device, queuePairsGraphics);
-        std::vector<Queue> computeQueues = getQueues(device, queuePairsCompute );
+        std::vector<Queue> computeQueues  = getQueues(device, queuePairsCompute);
         std::vector<Queue> transferQueues = getQueues(device, queuePairsTransfer);
 
     	return QueueManager( std::move(graphicsQueues), std::move(computeQueues), std::move(transferQueues), 0);
@@ -205,20 +205,22 @@ namespace vkcv {
 			vk::SurfaceKHR &surface
 	) {
 		std::vector<vk::QueueFamilyProperties> qFamilyProperties = physicalDevice.getQueueFamilyProperties();
-		std::vector<vk::Bool32> presentSupport(qFamilyProperties.size(),-1);
 
-		for(uint32_t i = 0; i < qFamilyProperties.size(); i++)
-		{
-			physicalDevice.getSurfaceSupportKHR(i,surface,&presentSupport[i]);
-			if(presentSupport[i] == VK_TRUE){
+		for(uint32_t i = 0; i < qFamilyProperties.size(); i++) {
+			vk::Bool32 presentSupport;
+			
+			if ((vk::Result::eSuccess == physicalDevice.getSurfaceSupportKHR(i, surface, &presentSupport)) &&
+				(presentSupport == VK_TRUE)) {
 				return i;
 			}
 		}
-		vkcv_log(LogLevel::WARNING, "no supported present queueQ");
+		
+		vkcv_log(LogLevel::WARNING, "No supported present queue");
 		return 0;
 	}
 
-	QueueManager::QueueManager(std::vector<Queue>&& graphicsQueues, std::vector<Queue>&& computeQueues, std::vector<Queue>&& transferQueues, size_t presentIndex)
+	QueueManager::QueueManager(std::vector<Queue>&& graphicsQueues, std::vector<Queue>&& computeQueues,
+							   std::vector<Queue>&& transferQueues, size_t presentIndex)
 	: m_graphicsQueues(graphicsQueues), m_computeQueues(computeQueues), m_transferQueues(transferQueues), m_presentIndex(presentIndex)
     {}