added some fixes for windows