Small fixes for Windows platform