Fixing compilation issues on various compilers, i.e. old GCC, clang,
ICPC