more fixes, for windows