Minor fixes for windows.