Note Windows fixes.