* Minor fixes for Windows