Fixes for windows.
More windows tweaks.