Fix TeXSample 2.0.0 bugs workarounds