Small Windows fixes.