diff --git a/PInvoke/Gdi32/WinGdi.Bitmap.cs b/PInvoke/Gdi32/WinGdi.Bitmap.cs
index 32693f80..6956dd4e 100644
--- a/PInvoke/Gdi32/WinGdi.Bitmap.cs
+++ b/PInvoke/Gdi32/WinGdi.Bitmap.cs
@@ -592,7 +592,7 @@ public static partial class Gdi32
 	// BITMAPINFOHEADER *pbmih, DWORD flInit, const VOID *pjBits, const BITMAPINFO *pbmi, UINT iUsage );
 	[DllImport(Lib.Gdi32, SetLastError = false, ExactSpelling = true)]
 	[PInvokeData("wingdi.h", MSDNShortId = "e9a5b525-a6b6-4309-9e53-69d274b85783")]
-	public static extern SafeHBITMAP CreateDIBitmap(HDC hdc, in BITMAPINFOHEADER pbmih, CBM flInit, [In, Optional] byte[]? pjBits, in BITMAPINFO pbmi, DIBColorMode iUsage);
+	public static extern SafeHBITMAP CreateDIBitmap(HDC hdc, in BITMAPINFOHEADER pbmih, CBM flInit, [In, Optional] byte[]? pjBits, [In, Optional] SafeBITMAPINFO pbmi, DIBColorMode iUsage);
 
 	/// <summary>
 	/// The <c>CreateDIBitmap</c> function creates a compatible bitmap (DDB) from a DIB and, optionally, sets the bitmap bits.
diff --git a/PInvoke/Gdi32/WinGdi.Metafile.cs b/PInvoke/Gdi32/WinGdi.Metafile.cs
index 1c3fca7f..b5637c3c 100644
--- a/PInvoke/Gdi32/WinGdi.Metafile.cs
+++ b/PInvoke/Gdi32/WinGdi.Metafile.cs
@@ -880,7 +880,7 @@ public static partial class Gdi32
 	[DllImport(Lib.Gdi32, SetLastError = true, ExactSpelling = true)]
 	[PInvokeData("wingdi.h", MSDNShortId = "bef5f43e-219a-4f8a-986d-290e29e17c4e")]
 	[return: MarshalAs(UnmanagedType.Bool)]
-	public static extern bool EnumEnhMetaFile([Optional] HDC hdc, HENHMETAFILE hmf, EnhMetaFileProc proc, [Optional] IntPtr param, [In, Optional] PRECT lpRect);
+	public static extern bool EnumEnhMetaFile([Optional] HDC hdc, HENHMETAFILE hmf, EnhMetaFileProc proc, [Optional] IntPtr param, [In, Optional] PRECT? lpRect);
 
 	/// <summary>
 	/// <para>
diff --git a/UnitTests/PInvoke/Gdi32/BitmapTests.cs b/UnitTests/PInvoke/Gdi32/BitmapTests.cs
index 2acb4a49..1f67218c 100644
--- a/UnitTests/PInvoke/Gdi32/BitmapTests.cs
+++ b/UnitTests/PInvoke/Gdi32/BitmapTests.cs
@@ -1,6 +1,4 @@
 using NUnit.Framework;
-using System;
-using System.Runtime.InteropServices;
 using static Vanara.PInvoke.Gdi32;
 using static Vanara.PInvoke.Kernel32;
 using static Vanara.PInvoke.User32;
@@ -94,7 +92,7 @@ public class BitmapTests
 		hbmp = CreateDIBitmap(hdc, bmi.bmiHeader, CBM.CBM_INIT, default, bmi, DIBColorMode.DIB_PAL_COLORS);
 		Assert.That(hbmp, ResultIs.ValidHandle);
 
-		hbmp = CreateDIBitmap(hdc, bmi.bmiHeader, CBM.CBM_INIT, default, default, DIBColorMode.DIB_PAL_COLORS);
+		hbmp = CreateDIBitmap(hdc, bmi.bmiHeader, CBM.CBM_INIT, default, SafeBITMAPINFO.Null, DIBColorMode.DIB_PAL_COLORS);
 		Assert.That(hbmp, ResultIs.ValidHandle);
 
 		//hbmp = CreateDIBitmap(hdc, bmi.bmiHeader, 0, (IntPtr)0xc0000000, bmi, DIBColorMode.DIB_PAL_COLORS);
diff --git a/UnitTests/PInvoke/Gdi32/Gdi32Tests.cs b/UnitTests/PInvoke/Gdi32/Gdi32Tests.cs
index 1dff37be..99b8a198 100644
--- a/UnitTests/PInvoke/Gdi32/Gdi32Tests.cs
+++ b/UnitTests/PInvoke/Gdi32/Gdi32Tests.cs
@@ -1,8 +1,5 @@
 using NUnit.Framework;
-using System;
 using System.Linq;
-using System.Runtime.InteropServices;
-using Vanara.InteropServices;
 using static Vanara.PInvoke.Gdi32;
 
 namespace Vanara.PInvoke.Tests;