Changes for building under windows