Win32 and GTK3 fixes