diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKQueue.h b/MoltenVK/MoltenVK/GPUObjects/MVKQueue.h
index 1fe9421d..994e0155 100644
--- a/MoltenVK/MoltenVK/GPUObjects/MVKQueue.h
+++ b/MoltenVK/MoltenVK/GPUObjects/MVKQueue.h
@@ -228,12 +228,12 @@ public:
 protected:
 	id<MTLCommandBuffer> getMTLCommandBuffer();
 	
-	typedef struct PresentInfo {
+	typedef struct  {
 		MVKPresentableSwapchainImage* presentableImage;
 		bool hasPresentTime;          // Keep track of whether present included VK_GOOGLE_display_timing
 		uint32_t presentID;           // VK_GOOGLE_display_timing presentID
 		uint64_t desiredPresentTime;  // VK_GOOGLE_display_timing desired presentation time in nanoseconds
-	};
+	} PresentInfo;
 
 	MVKVectorInline<PresentInfo, 4> _presentInfo;
 };
diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.h b/MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.h
index 2fec78f6..79a25dc6 100644
--- a/MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.h
+++ b/MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.h
@@ -125,7 +125,7 @@ protected:
     std::atomic<bool> _surfaceLost;
     MVKBlockObserver* _layerObserver;
 	static const int kMaxPresentationHistory = 60;
-	VkPastPresentationTimingGOOGLE _presentTimingHistory[60];
+	VkPastPresentationTimingGOOGLE _presentTimingHistory[kMaxPresentationHistory];
 	uint32_t _presentHistoryCount;
 	uint32_t _presentHistoryIndex;
 	uint32_t _presentHistoryHeadIndex;