Changes from building on windows