Fixed misc annoyances for win32 building, etc.