Fixes for building on Windows