Windows fixes and whatnot