Fixes for Windows hosts