Fixes for the windows build