Small fixes for Windows