Second part of fixes from Laurent Rabret.
5 files changed