some fixes for windows