Few fixes for Windows