Minor cleanup
Small fixes for Windows build