Fixed a couple of windows related issues.