add GDI fixes