Checked in minor fixes for win32