Some more fixes for windows