(1) SF patch# 1755214 by Amaury Forgeot d'Arc which makes some tests

pass on Windows.

(2) Fix a typo in makefile() where using a text mode would attempt to set
    self.mode instead of text.mode.