-Windows fixes and ST3 fixes