Windows

Windows compatibility fixes.