Minor adjustments to look OK on Win32