Removed last OS X problems on Windows.