corrections required for portability. To be validated by buildbot