And fix it under Windows. Plus a typo.