Made Windows compiles work again
Minor windows compile fixes