Fix some windows related stuff, add other Windows related stuff.