Fix some things for windows