Some more minor GDI fixes.