Improve compatibility with old compilers and fix test
2 files changed