Fixed things for windows!