Some fix for windows

Some fix for windows.