Changes for windows building

still currently broken