Minor changes needed for Windows