More attempts at fixing Windows and OS X.