Fixes/windows build