Further Windows fixes